You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2013/03/11 12:55:46 UTC

svn commit: r1455104 - /river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/AbstractServiceAdmin.java

Author: peter_firmstone
Date: Mon Mar 11 11:55:46 2013
New Revision: 1455104

URL: http://svn.apache.org/r1455104
Log:
swallow and log URISyntaxException

Modified:
    river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/AbstractServiceAdmin.java

Modified: river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/AbstractServiceAdmin.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/AbstractServiceAdmin.java?rev=1455104&r1=1455103&r2=1455104&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/AbstractServiceAdmin.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/qa/src/com/sun/jini/qa/harness/AbstractServiceAdmin.java Mon Mar 11 11:55:46 2013
@@ -322,16 +322,21 @@ public abstract class AbstractServiceAdm
      *         if codebase integrity is required and a problem occurs
      *         converting the URL
      */
-    protected final String getServiceCodebase() throws TestException, URISyntaxException {
+    protected final String getServiceCodebase() throws TestException {
 	codebase = getMandatoryParameter("codebase");
-	codebase = fixCodebase(codebase);
-        codebase = uriToCodebaseString(pathToURIs(codebase));
+	String cb = fixCodebase(codebase);
+        try {
+            codebase = uriToCodebaseString(pathToURIs(cb));
+        } catch (URISyntaxException e){
+            logger.log(Level.FINE,"Codebase not URI compliant: "+ cb, e);
+            codebase = cb;
+        }
 	return  codebase;
     }
     
     /**
      * Convert a string containing a space-separated list of URL Strings into a
-     * corresponding array of URI objects, throwing a MalformedURLException
+     * corresponding array of URI objects, throwing a URIsyntaxException
      * if any of the URLs are invalid.  This method returns null if the
      * specified string is null.
      *