cleanup

syncloud · Feb 20, 2015 · 1fe8c66 · 1fe8c66
1 parent 89208aa
commit 1fe8c66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/common/src/main/java/org/syncloud/common/upnp/igd/Router.java b/common/src/main/java/org/syncloud/common/upnp/igd/Router.java
@@ -56,7 +56,7 @@ public int getPortMappingsCount() {
 
     private List<PortMapping> getPortMappings() {
 
-        ArrayList<PortMapping> mappings = new ArrayList<>();
+        ArrayList<PortMapping> mappings = new ArrayList<PortMapping>();
         long i = 0;
         while (i < LIMIT) {
 
@@ -111,7 +111,7 @@ private boolean removePortMapping(PortMapping portMapping) {
     private <T extends ActionCallback> T sync(UpnpService upnpService, T callback) {
         try {
             upnpService.getControlPoint().execute(callback).get(timeout, TimeUnit.SECONDS);
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+        } catch (Exception e) {
             logger.error("interrupted: " + e.getMessage());
         }
         return callback;

diff --git a/common/src/main/java/org/syncloud/common/upnp/igd/action/cling/GetPortMappingEntry.java b/common/src/main/java/org/syncloud/common/upnp/igd/action/cling/GetPortMappingEntry.java
@@ -10,8 +10,7 @@
 
 import java.util.Map;
 
-//TODO: Modeled after org.fourthline.cling.support.igd.callback.GetExternalIP
-//TODO: Ideally has to be moved upstream
+//TODO: Remover after this is merged https://github.com/4thline/cling/pull/116
 public abstract class GetPortMappingEntry extends ActionCallback {
 
     public GetPortMappingEntry(Service service, long index) {