avoid memory/resource leaks

Author: gbburkhardt

src/gov/nasa/worldwind/data/BasicRasterServer.java

@@ -140,6 +140,8 @@ protected void init(Object o)
             String message = Logging.getMessage("generic.DataSetLimitedAvailability", this.getDataSetName() );
             Logging.logger().severe(message);
         }
+        
+        config.dispose();
     }
 
     protected String getDataSetName()

src/gov/nasa/worldwind/data/RasterServerConfiguration.java

@@ -143,6 +143,16 @@ public RasterServerConfiguration(Object docSource)
 
         this.initialize();
     }
+    
+    public void dispose() {
+    	try {
+			eventReader.close();
+		} catch (XMLStreamException e) {
+			e.printStackTrace();
+		}
+    	WWXML.closeEventReader(eventReader, "RasterServerConfiguration");
+    	freeResources();
+    }
 
     protected void initialize()
     {

src/gov/nasa/worldwind/util/WWXML.java

@@ -39,6 +39,8 @@ public class WWXML
 {
     public static final String XLINK_URI = "http://www.w3.org/1999/xlink";
 
+    private static Map<XMLEventReader, InputStream> inputSources = new HashMap<XMLEventReader, InputStream>();
+    
     /**
      * Create a DOM builder.
      *
@@ -170,9 +172,12 @@ public static Document openDocumentFile(String filePath, Class c)
             throw new IllegalArgumentException(message);
         }
 
-        InputStream inputStream = WWIO.openFileOrResourceStream(filePath, c);
-
-        return inputStream != null ? openDocumentStream(inputStream) : null;
+        try (InputStream inputStream = WWIO.openFileOrResourceStream(filePath, c)) {
+        	return inputStream != null ? openDocumentStream(inputStream) : null;
+        } catch (IOException e) {
+        	e.printStackTrace();
+        	return null;
+        }
     }
 
     /**
@@ -273,10 +278,7 @@ public static void saveDocumentToFile(Document doc, String filePath)
             throw new IllegalArgumentException(message);
         }
 
-        try
-        {
-            java.io.FileOutputStream outputStream = new java.io.FileOutputStream(filePath);
-
+        try (java.io.FileOutputStream outputStream = new java.io.FileOutputStream(filePath)) {
             saveDocumentToStream(doc, outputStream);
         }
         catch (IOException e)
@@ -356,7 +358,9 @@ public static XMLEventReader openEventReaderStream(InputStream inputStream, bool
 
         try
         {
-            return inputFactory.createXMLEventReader(inputStream);
+        	XMLEventReader reader = inputFactory.createXMLEventReader(inputStream);
+            inputSources.put(reader, inputStream);
+            return reader;
         }
         catch (XMLStreamException e)
         {
@@ -440,7 +444,9 @@ public static XMLEventReader openEventReaderURL(URL url, boolean isNamespaceAwar
         try
         {
             InputStream inputStream = url.openStream();
-            return openEventReaderStream(inputStream, isNamespaceAware);
+            XMLEventReader reader = openEventReaderStream(inputStream, isNamespaceAware);
+            inputSources.put(reader, inputStream);
+            return reader;
         }
         catch (IOException e)
         {
@@ -531,6 +537,15 @@ public static void closeEventReader(XMLEventReader eventReader, String name)
         try
         {
             eventReader.close();
+            InputStream is = inputSources.get(eventReader);
+            if (is != null) {
+            	try {
+					is.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+            	inputSources.remove(eventReader);
+            }
         }
         catch (XMLStreamException e)
         {