Sho SHIMIZU
Committed by Ray Milkey

Use auto-unboxing instead of manual unboxing

Change-Id: I50c66b1b63729bff2c4b3416664f391f2e900bd3
...@@ -97,7 +97,7 @@ public class ECMPShortestPathGraph { ...@@ -97,7 +97,7 @@ public class ECMPShortestPathGraph {
97 } 97 }
98 98
99 Integer distance = deviceSearched.get(reachedDevice); 99 Integer distance = deviceSearched.get(reachedDevice);
100 - if ((distance != null) && (distance.intValue() < (currDistance + 1))) { 100 + if ((distance != null) && (distance < (currDistance + 1))) {
101 continue; 101 continue;
102 } 102 }
103 if (distance == null) { 103 if (distance == null) {
...@@ -171,7 +171,7 @@ public class ECMPShortestPathGraph { ...@@ -171,7 +171,7 @@ public class ECMPShortestPathGraph {
171 } 171 }
172 172
173 Integer distance = deviceSearched.get(reachedDevice); 173 Integer distance = deviceSearched.get(reachedDevice);
174 - if ((distance != null) && (distance.intValue() < (currDistance + 1))) { 174 + if ((distance != null) && (distance < (currDistance + 1))) {
175 continue; 175 continue;
176 } 176 }
177 if (distance == null) { 177 if (distance == null) {
......
...@@ -313,13 +313,13 @@ public class DefaultGroupHandler { ...@@ -313,13 +313,13 @@ public class DefaultGroupHandler {
313 return -1; 313 return -1;
314 } else { 314 } else {
315 log.debug("getNextObjectiveId in device{}: Next objective id {} " 315 log.debug("getNextObjectiveId in device{}: Next objective id {} "
316 - + "created for {}", deviceId, nextId.intValue(), ns); 316 + + "created for {}", deviceId, nextId, ns);
317 } 317 }
318 } else { 318 } else {
319 log.trace("getNextObjectiveId in device{}: Next objective id {} " 319 log.trace("getNextObjectiveId in device{}: Next objective id {} "
320 - + "found for {}", deviceId, nextId.intValue(), ns); 320 + + "found for {}", deviceId, nextId, ns);
321 } 321 }
322 - return nextId.intValue(); 322 + return nextId;
323 } 323 }
324 324
325 /** 325 /**
......