Changeset 343:7f06d669913d for kraken-linux-api/src/main/java/org/krakenapps/linux/api/RoutingTable.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/RoutingTable.java (modified) (7 diffs)

kraken-linux-api/src/main/java/org/krakenapps/linux/api/RoutingTable.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;
 
@@ -12 +27 @@
 
 public class RoutingTable {
-        public static List<RoutingEntry> getRoutingEntries() {
+        public static List<RoutingEntry> getRoutingEntries() throws IOException {
                 List<RoutingEntry> entries = new ArrayList<RoutingEntry>();
                 java.lang.Process p = null;
@@ -37 +52 @@
                                         int use = Integer.parseInt(tokens[6]);
                                         String iface = tokens[7];
-                                        entries.add(new RoutingEntry(destination, gateway, genmask, flags, metric, ref, use, iface, null,
-                                                        null, null));
+                                        entries.add(new RoutingEntry(destination, gateway, genmask, flags, metric, ref, use, iface, null, null, null));
                                 } else if (tokens.length == 11) {
                                         InetAddress destination = (!tokens[0].equals("default")) ? InetAddress.getByName(tokens[0]) : null;
@@ -51 +65 @@
                                         int window = Integer.parseInt(tokens[9]);
                                         int irtt = Integer.parseInt(tokens[10]);
-                                        entries.add(new RoutingEntry(destination, gateway, genmask, flags, metric, ref, use, iface, mss,
-                                                        window, irtt));
+                                        entries.add(new RoutingEntry(destination, gateway, genmask, flags, metric, ref, use, iface, mss, window, irtt));
                                 }
                         }
-                } 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();
                 }
 
@@ -71 +78 @@
         }
 
-        public static List<RoutingEntryV6> getIpv6RoutingEntries() {
+        public static List<RoutingEntryV6> getIpv6RoutingEntries() throws IOException {
                 List<RoutingEntryV6> entries = new ArrayList<RoutingEntryV6>();
                 java.lang.Process p = null;
@@ -106 +113 @@
                                 entries.add(new RoutingEntryV6(destination, nextHop, mask, flags, metric, ref, use, 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();
                 }
 
@@ -170 +171 @@
         }
 
-        public static RoutingEntry findRoute(InetAddress ip) {
+        public static RoutingEntry findRoute(InetAddress ip) throws IOException {
                 int target = toInt((Inet4Address) ip);