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

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

@@ -1 @@
-package org.krakenapps.linux.api;
+/*
+ * 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;
 
 import java.io.BufferedReader;
@@ -43 +57 @@
         private List<AddressBinding> addressBindings;
 
-        public EthernetInterface(String device) throws FileNotFoundException {
+        public EthernetInterface(String device) throws IOException {
                 BufferedReader br = null;
                 String line = null;
@@ -107 +121 @@
                                 }
                         }
-                } catch (IOException e) {
-                        e.printStackTrace();
                 } finally {
-                        try {
+                        if (br != null)
                                 br.close();
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
                 }
 
@@ -147 +156 @@
                                                 subAddr.description.add(line);
                                 }
-                                br.close();
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
+                        } finally {
+                                if (br != null)
+                                        br.close();
+                        }
+                        
                         addressBindings.add(subAddr);
                 }
         }
 
-        public static List<EthernetInterface> getEthernetInterfaces() {
+        public static List<EthernetInterface> getEthernetInterfaces() throws IOException {
                 List<EthernetInterface> interfaces = new ArrayList<EthernetInterface>();
                 String[] filenames = new File(cfgPath).list(new FilenameFilter() {