You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2009/04/21 21:55:29 UTC

svn commit: r767275 - in /servicemix/smx4/kernel/trunk/gshell/gshell-features/src: main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java

Author: gertv
Date: Tue Apr 21 19:55:29 2009
New Revision: 767275

URL: http://svn.apache.org/viewvc?rev=767275&view=rev
Log:
SMX4KNL-265: Improve message on exceptions thrown for wrong URI in features

Modified:
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
    servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java?rev=767275&r1=767274&r2=767275&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java Tue Apr 21 19:55:29 2009
@@ -139,7 +139,9 @@
         } catch (ParserConfigurationException e) {
             throw (IOException) new IOException().initCause(e);
         } catch (URISyntaxException e) {
-            throw (IOException) new IOException().initCause(e);
+            throw new IOException(e.getMessage() + " : " + uri, e);
+        } catch (IllegalArgumentException e) {
+            throw new IOException(e.getMessage() + " : " + uri, e);
         }
     }
 

Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java?rev=767275&r1=767274&r2=767275&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/test/java/org/apache/servicemix/kernel/gshell/features/RepositoryTest.java Tue Apr 21 19:55:29 2009
@@ -60,4 +60,14 @@
         assertEquals(1, features[1].getBundles().size());
         assertEquals("b3", features[1].getBundles().get(0));
     }
+    
+    public void testShowWrongUriInException() throws Exception {
+        String uri = "src/test/resources/org/apache/servicemix/kernel/gshell/features/repo1.xml";
+        RepositoryImpl r = new RepositoryImpl(new URI(uri));
+        try {
+            r.load();
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains(uri));
+        }
+    }
 }