ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing deserialization of empty collections from delivery.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-12-12 23:41:21 +00:00
parent 1a8235746b
commit 8981c3b773
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTransferDAO.java
View File

@@ -20,7 +20,7 @@ public class DbTransferDAO implements TransferDAO {
@Override
public void addTransferFrom(String player, String reason, String collectionName, int currency, CardCollection items) {
if (currency>0 || items.getAll().size()>0) {
if (currency > 0 || items.getAll().size() > 0) {
try {
Connection connection = _dbAccess.getDataSource().getConnection();
try {
@@ -170,10 +170,12 @@ public class DbTransferDAO implements TransferDAO {
private CardCollection deserializeCollection(String collection) {
DefaultCardCollection cardCollection = new DefaultCardCollection();
for (String item : collection.split(",")) {
String[] itemSplit = item.split("x", 2);
int count = Integer.parseInt(itemSplit[0]);
String blueprintId = itemSplit[1];
cardCollection.addItem(blueprintId, count);
if (item.length() > 0) {
String[] itemSplit = item.split("x", 2);
int count = Integer.parseInt(itemSplit[0]);
String blueprintId = itemSplit[1];
cardCollection.addItem(blueprintId, count);
}
}
return cardCollection;