/ - Diff - Application: gvSIG desktop - gvSIG

Revision 41851

+                }
                 connection = (HttpURLConnection) url.openConnection();
                 connection.setUseCaches(false);
                 connection.setRequestProperty("User-Agent", "Mozilla/5.0 (gvSIG) like Gecko");
                 connection.setConnectTimeout(timeout);
                 //If it uses a HTTP POST
                 if (data != null) {
-...
                     os = new OutputStreamWriter(connection.getOutputStream());
                     os.write(data);
                     os.flush();
                     is = new DataInputStream(connection.getInputStream());
                 } else {
                     is = new DataInputStream(url.openStream());
+                }
                 is = new DataInputStream(connection.getInputStream());
                 dos = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(dstFile)));
                 byte[] buffer = new byte[1024 * 4];

     package org.gvsig.remoteclient.wms;
     import java.io.BufferedInputStream;
     import java.io.DataInputStream;
     import java.io.IOException;
     import java.io.StringReader;
-...
              return "";
+         }
          private static String getSuitableWMSVersion(String host, String _version, int size) throws ConnectException, IOException, XmlPullParserException
+         {
         	String request = WMSProtocolHandler.buildCapabilitiesSuitableVersionRequest(host, _version);
         	String version = new String();
         	StringReader reader = null;
         	DataInputStream dis = null;
     		try
+    		{
     			URL url = new URL(request);
                 byte[] buffer = new byte[size];
         private static String readFromUrl(String url_s, int size) throws IOException {
             byte[] buffer = new byte[size];
             DataInputStream dis = null;
             BufferedInputStream bis = null;
             try {
                 URL url = new URL(url_s);
                 URLConnection conn = url.openConnection();
                 conn.setRequestProperty("Accept", "text/xml, text/*, */*");
                 conn.setRequestProperty("User-Agent", "Mozilla/5.0 (gvSIG) like Gecko");
                 dis = new DataInputStream(conn.getInputStream());
                 dis.readFully(buffer);
                 String string = new String(buffer);
                 bis = new BufferedInputStream(dis);
                 bis.read(buffer);
             } finally {
                 if( bis != null ) {
                     try {
                         bis.close();
                     } catch(Exception e) {
                         logger.warn("Can't close BufferedInputStream", e);
+                    }
                     bis = null;
+                }
                 if( dis != null ) {
                     try {
                         dis.close();
                     } catch(Exception e) {
                         logger.warn("Can't close DataInputStream", e);
+                    }
                     dis = null;
+                }
+            }
             String sbuffer = new String(buffer);
             return sbuffer;
+        }
         private static String getSuitableWMSVersion(String host, String _version, int size) throws ConnectException, IOException, XmlPullParserException {
             String request = WMSProtocolHandler.buildCapabilitiesSuitableVersionRequest(host, _version);
             String version = new String();
             StringReader reader = null;
     //        DataInputStream dis = null;
             try {
     //            URL url = new URL(request);
     //            byte[] buffer = new byte[size];
     //            URLConnection conn = url.openConnection();
     //            conn.setRequestProperty("Accept", "text/xml, text/*, */*");
     //            conn.setRequestProperty("User-Agent", "Mozilla/5.0 (gvSIG) like Gecko");
     //            dis = new DataInputStream(conn.getInputStream());
     //            dis.readFully(buffer);
     //            String string = new String(buffer);
                 String string = readFromUrl(request, size);
                 // patch for ArcIMS + WMS connector > 9.0 bug
                 int a = string.toLowerCase().indexOf("<?xml");
                 if (a !=-1)
                 	string = string.substring(a, string.length());
                 if ( a != -1 ) {
                     string = string.substring(a, string.length());
+                }
                 // end patch
                 reader = new StringReader(string);
     	    	KXmlParser kxmlParser = null;
     	    	kxmlParser = new KXmlParser();
         		kxmlParser.setInput(reader);
     			kxmlParser.nextTag();
         		if ( kxmlParser.getEventType() != KXmlParser.END_DOCUMENT )
+        		{
         			if ((kxmlParser.getName().compareTo(CapabilitiesTags.CAPABILITIES_ROOT1_1_0)==0)
         				||(kxmlParser.getName().compareTo(CapabilitiesTags.CAPABILITIES_ROOT1_1_1)==0)
         				||(kxmlParser.getName().compareTo(CapabilitiesTags.CAPABILITIES_ROOT1_3_0)==0))
+        			{
         				version = kxmlParser.getAttributeValue("", CapabilitiesTags.VERSION);
+        			}
+        		}
         		// do not forget to close the Stream.
         		reader.close();
         		dis.close();
     			return version;
+    		}
     		catch(ConnectException conEx)
+    		{
     			throw new ConnectException(conEx.getMessage());
+    		}
     		catch(IOException ioEx)
+    		{
     			throw new IOException(ioEx.getMessage());
+    		}
     		catch(XmlPullParserException xmlEx)
+    		{
                         throw  xmlEx;
                 KXmlParser kxmlParser = null;
                 kxmlParser = new KXmlParser();
                 kxmlParser.setInput(reader);
                 kxmlParser.nextTag();
                 if ( kxmlParser.getEventType() != KXmlParser.END_DOCUMENT ) {
                     if ( (kxmlParser.getName().compareTo(CapabilitiesTags.CAPABILITIES_ROOT1_1_0) == 0)
                             || (kxmlParser.getName().compareTo(CapabilitiesTags.CAPABILITIES_ROOT1_1_1) == 0)
                             || (kxmlParser.getName().compareTo(CapabilitiesTags.CAPABILITIES_ROOT1_3_0) == 0) ) {
                         version = kxmlParser.getAttributeValue("", CapabilitiesTags.VERSION);
+                    }
+                }
                 // do not forget to close the Stream.
                 reader.close();
                 reader = null;
     //            dis.close();
                 return version;
             } catch (ConnectException conEx) {
                 throw new ConnectException(conEx.getMessage());
             } catch (IOException ioEx) {
                 throw new IOException(ioEx.getMessage());
             } catch (XmlPullParserException xmlEx) {
                 throw xmlEx;
     //                    logger.warn("Can't determine server version",xmlEx);
     //                    return "";
+    		}
     		finally{
     			if (reader != null)
+    			{
     				try{
     					reader.close();
     				}catch(Exception ex){
                                             logger.warn("Can't close reader",ex);
+    				}
+    			}
     			if (dis != null)
+    			{
     				try {
     					dis.close();
     				} catch(Exception ex) {
                                             logger.warn("Can't close input stream",ex);
+    				}
+    			}
+    		}
+         }
             } finally {
                 if ( reader != null ) {
                     try {
                         reader.close();
                     } catch (Exception ex) {
                         logger.warn("Can't close reader", ex);
+                    }
+                }
     //            if ( dis != null ) {
     //                try {
     //                    dis.close();
     //                } catch (Exception ex) {
     //                    logger.warn("Can't close input stream", ex);
     //                }
     //            }
+            }
+        }
          /**
           * It creates an instance of a WMSDriver class.

Also available in: Unified diff