Changeset 343:7f06d669913d for kraken-linux-api/src/main/java/org/krakenapps/linux/api/NetworkInterface.java

Timestamp:

09/18/11 13:55:15 (8 months ago)

Author:

xeraph

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2777

Message:

• fixed potential handle leak bugs.
• added missing license terms

File:

• kraken-linux-api/src/main/java/org/krakenapps/linux/api/NetworkInterface.java (modified) (6 diffs)

kraken-linux-api/src/main/java/org/krakenapps/linux/api/NetworkInterface.java

@@ +1 @@
+/*
+ * Copyright 2011 Future Systems
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.krakenapps.linux.api;
 
@@ -107 +122 @@
         }
 
-        public static List<NetworkInterface> getNetworkInterfaces() {
+        public static List<NetworkInterface> getNetworkInterfaces() throws IOException {
                 List<NetworkInterface> ifaces = new ArrayList<NetworkInterface>();
                 java.lang.Process p = null;
@@ -122 +137 @@
                                 ifaces.add(iface);
                         }
-                } catch (IOException e) {
-                        e.printStackTrace();
                 } finally {
                         if (p != null)
                                 p.destroy();
-                        try {
-                                if (br != null)
-                                        br.close();
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
+                        if (br != null)
+                                br.close();
                 }
 
@@ -258 +267 @@
                 @Override
                 public String toString() {
-                        return "RxPacket [packets=" + packets + ", errors=" + errors + ", dropped=" + dropped + ", overruns="
-                                        + overruns + ", frame=" + frame + "]";
+                        return "RxPacket [packets=" + packets + ", errors=" + errors + ", dropped=" + dropped + ", overruns=" + overruns
+                                        + ", frame=" + frame + "]";
                 }
         }
@@ -332 +341 @@
                 @Override
                 public String toString() {
-                        return "TxPacket [packets=" + packets + ", errors=" + errors + ", dropped=" + dropped + ", overruns="
-                                        + overruns + ", carrier=" + carrier + ", collisions=" + collisions + ", queuelen=" + queuelen + "]";
+                        return "TxPacket [packets=" + packets + ", errors=" + errors + ", dropped=" + dropped + ", overruns=" + overruns
+                                        + ", carrier=" + carrier + ", collisions=" + collisions + ", queuelen=" + queuelen + "]";
                 }
         }
@@ -339 +348 @@
         @Override
         public String toString() {
-                return "NetworkInterface [name=" + name + ", linkEncap=" + linkEncap + ", hwaddr=" + hwaddr + ", inet=" + inet
-                                + ", ptp=" + ptp + ", mask=" + mask + ", inet6=" + inet6 + ", cidr=" + cidr + ", scope=" + scope
-                                + ", options=" + options + ", mtu=" + mtu + ", metric=" + metric + ", rxPacket=" + rxPacket
-                                + ", txPacket=" + txPacket + ", rxBytes=" + rxBytes + ", txBytes=" + txBytes + ", interrupt="
-                                + interrupt + ", baseAddress=" + baseAddress + ", memory=" + memory + "]";
+                return "NetworkInterface [name=" + name + ", linkEncap=" + linkEncap + ", hwaddr=" + hwaddr + ", inet=" + inet + ", ptp="
+                                + ptp + ", mask=" + mask + ", inet6=" + inet6 + ", cidr=" + cidr + ", scope=" + scope + ", options=" + options
+                                + ", mtu=" + mtu + ", metric=" + metric + ", rxPacket=" + rxPacket + ", txPacket=" + txPacket + ", rxBytes="
+                                + rxBytes + ", txBytes=" + txBytes + ", interrupt=" + interrupt + ", baseAddress=" + baseAddress + ", memory="
+                                + memory + "]";
         }
 }