Changeset 4145 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

Timestamp:

2011-06-19T15:11:18+02:00 (13 years ago)

Author:

stoecker

Message:

see #6213 - do more file closes hopefully fixing some update problems under windows

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -58 +58 @@
                 }
                 MirroredInputStream s = new MirroredInputStream(source, -1);
-                InputStreamReader r;
-                try
-                {
-                    r = new InputStreamReader(s, "UTF-8");
-                }
-                catch (UnsupportedEncodingException e)
-                {
-                    r = new InputStreamReader(s);
-                }
-                BufferedReader reader = new BufferedReader(r);
-                String line;
-                while((line = reader.readLine()) != null)
-                {
-                    String val[] = line.split(";");
-                    if(!line.startsWith("#") && (val.length == 3 || val.length == 4)) {
-                        boolean force = "true".equals(val[0]);
-                        String name = tr(val[1]);
-                        String url = val[2];
-                        String eulaAcceptanceRequired = null;
+                try {
+                    InputStreamReader r;
+                    try
+                    {
+                        r = new InputStreamReader(s, "UTF-8");
+                    }
+                    catch (UnsupportedEncodingException e)
+                    {
+                        r = new InputStreamReader(s);
+                    }
+                    BufferedReader reader = new BufferedReader(r);
+                    String line;
+                    while((line = reader.readLine()) != null)
+                    {
+                        String val[] = line.split(";");
+                        if(!line.startsWith("#") && (val.length == 3 || val.length == 4)) {
+                            boolean force = "true".equals(val[0]);
+                            String name = tr(val[1]);
+                            String url = val[2];
+                            String eulaAcceptanceRequired = null;
 
-                        if (val.length == 4) {
-                            // 4th parameter optional for license agreement (EULA)
-                            eulaAcceptanceRequired = val[3];
-                        }
+                            if (val.length == 4) {
+                                // 4th parameter optional for license agreement (EULA)
+                                eulaAcceptanceRequired = val[3];
+                            }
 
-                        defaultLayers.add(new ImageryInfo(name, url, eulaAcceptanceRequired));
+                            defaultLayers.add(new ImageryInfo(name, url, eulaAcceptanceRequired));
 
-                        if (force) {
-                            defaultsSave.add(url);
-                            if (!defaults.contains(url)) {
-                                for (ImageryInfo i : layers) {
-                                    if ((i.getImageryType() == ImageryType.WMS && url.equals(i.getUrl()))
-                                            || url.equals(i.getFullUrl())) {
-                                        force = false;
+                            if (force) {
+                                defaultsSave.add(url);
+                                if (!defaults.contains(url)) {
+                                    for (ImageryInfo i : layers) {
+                                        if ((i.getImageryType() == ImageryType.WMS && url.equals(i.getUrl()))
+                                                || url.equals(i.getFullUrl())) {
+                                            force = false;
+                                        }
                                     }
-                                }
-                                if (force) {
-                                    add(new ImageryInfo(name, url));
+                                    if (force) {
+                                        add(new ImageryInfo(name, url));
+                                    }
                                 }
                             }
                         }
                     }
+                } finally {
+                    s.close();
                 }
             }