Merge pull request #322 from DevFactory/dead-stores-fix-1

Fixing squid:S1854 - Dead stores should be removed
This commit is contained in:
Ilkka Seppälä 2015-12-26 13:38:16 +02:00
commit 3d8c64d76d
2 changed files with 8 additions and 9 deletions

View File

@ -65,8 +65,8 @@ public class App {
AppManager.save(userAccount1); AppManager.save(userAccount1);
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
userAccount1 = AppManager.find("001"); AppManager.find("001");
userAccount1 = AppManager.find("001"); AppManager.find("001");
} }
/** /**
@ -80,15 +80,15 @@ public class App {
AppManager.save(userAccount2); AppManager.save(userAccount2);
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
userAccount2 = AppManager.find("002"); AppManager.find("002");
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
userAccount2 = AppManager.find("002"); userAccount2 = AppManager.find("002");
userAccount2.setUserName("Jane G."); userAccount2.setUserName("Jane G.");
AppManager.save(userAccount2); AppManager.save(userAccount2);
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
userAccount2 = AppManager.find("002"); AppManager.find("002");
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
userAccount2 = AppManager.find("002"); AppManager.find("002");
} }
/** /**
@ -106,12 +106,12 @@ public class App {
AppManager.save(userAccount4); AppManager.save(userAccount4);
AppManager.save(userAccount5); AppManager.save(userAccount5);
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
userAccount3 = AppManager.find("003"); AppManager.find("003");
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
UserAccount userAccount6 = new UserAccount("006", "Yasha", "She is an only child."); UserAccount userAccount6 = new UserAccount("006", "Yasha", "She is an only child.");
AppManager.save(userAccount6); AppManager.save(userAccount6);
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
userAccount4 = AppManager.find("004"); AppManager.find("004");
System.out.println(AppManager.printCacheContent()); System.out.println(AppManager.printCacheContent());
} }
} }

View File

@ -57,10 +57,9 @@ public class RainbowFishSerializer {
* Read V1 RainbowFish from file * Read V1 RainbowFish from file
*/ */
public static RainbowFish readV1(String filename) throws IOException, ClassNotFoundException { public static RainbowFish readV1(String filename) throws IOException, ClassNotFoundException {
Map<String, String> map = null;
FileInputStream fileIn = new FileInputStream(filename); FileInputStream fileIn = new FileInputStream(filename);
ObjectInputStream objIn = new ObjectInputStream(fileIn); ObjectInputStream objIn = new ObjectInputStream(fileIn);
map = (Map<String, String>) objIn.readObject(); Map<String, String> map = (Map<String, String>) objIn.readObject();
objIn.close(); objIn.close();
fileIn.close(); fileIn.close();
return new RainbowFish(map.get("name"), Integer.parseInt(map.get("age")), Integer.parseInt(map return new RainbowFish(map.get("name"), Integer.parseInt(map.get("age")), Integer.parseInt(map