diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index 92753bf9e55..ce9f345f463 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -543,7 +543,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect { movedCard = game.getAction().moveTo(destination, tgtC); // If a card is Exiled from the stack, remove its spells from the stack if (sa.hasParam("Fizzle")) { - final FCollectionView spells = tgtC.getSpellAbilities(); if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand) || tgtC.isInZone(ZoneType.Stack)) { // This only fizzles spells, not anything else. game.getStack().remove(tgtC); diff --git a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java index b83d8bf7033..918a35ef677 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java +++ b/forge-gui-desktop/src/main/java/forge/gui/ImportDialog.java @@ -1010,15 +1010,21 @@ public class ImportDialog { destFile.createNewFile(); } + FileInputStream srcStream = null; FileChannel src = null; + FileOutputStream destStream = null; FileChannel dest = null; try { - src = new FileInputStream(srcFile).getChannel(); - dest = new FileOutputStream(destFile).getChannel(); + srcStream = new FileInputStream(srcFile); + src = srcStream.getChannel(); + destStream = new FileOutputStream(destFile); + dest = destStream.getChannel(); dest.transferFrom(src, 0, src.size()); } finally { if (src != null) { src.close(); } + if (srcStream != null) { srcStream.close(); } if (dest != null) { dest.close(); } + if (destStream != null) { destStream.close(); } } if (deleteSrcAfter) {