You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2012/04/06 11:19:18 UTC
svn commit: r1310254 - in
/karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command:
AddUrlCommand.java FeaturesCommandSupport.java MultiException.java
RefreshUrlCommand.java
Author: gnodet
Date: Fri Apr 6 09:19:18 2012
New Revision: 1310254
URL: http://svn.apache.org/viewvc?rev=1310254&view=rev
Log:
[KARAF-1040] Commands should not catch exceptions but should rethrow them
Conflicts:
features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java
features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java
Conflicts:
features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java
Added:
karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/MultiException.java
Modified:
karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java
karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java
Modified: karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java?rev=1310254&r1=1310253&r2=1310254&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java (original)
+++ karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/AddUrlCommand.java Fri Apr 6 09:19:18 2012
@@ -17,6 +17,7 @@
package org.apache.karaf.features.command;
import java.net.URI;
+import java.util.ArrayList;
import java.util.List;
import org.apache.karaf.features.FeaturesService;
@@ -30,13 +31,14 @@ public class AddUrlCommand extends Featu
List<String> urls;
protected void doExecute(FeaturesService admin) throws Exception {
+ List<Exception> exceptions = new ArrayList<Exception>();
for (String url : urls) {
try {
admin.addRepository(new URI(url));
} catch (Exception e) {
- System.out.println("Could not add Feature Repository:\n" + e );
- System.out.println("Please verify that the feature repository URL is correct and that your network connection works fine.");
+ exceptions.add(e);
}
}
+ MultiException.throwIf("Unable to add repositories", exceptions);
}
}
Modified: karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java?rev=1310254&r1=1310253&r2=1310254&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java (original)
+++ karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/FeaturesCommandSupport.java Fri Apr 6 09:19:18 2012
@@ -16,8 +16,10 @@
*/
package org.apache.karaf.features.command;
-import org.apache.karaf.shell.console.OsgiCommandSupport;
+import java.net.URI;
+
import org.apache.karaf.features.FeaturesService;
+import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
public abstract class FeaturesCommandSupport extends OsgiCommandSupport {
Added: karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/MultiException.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/MultiException.java?rev=1310254&view=auto
==============================================================================
--- karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/MultiException.java (added)
+++ karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/MultiException.java Fri Apr 6 09:19:18 2012
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.features.command;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MultiException extends Exception {
+
+ private List<Exception> exceptions = new ArrayList<Exception>();
+
+ public MultiException(String message) {
+ super(message);
+ }
+
+ public MultiException(String message, List<Exception> exceptions) {
+ super(message);
+ this.exceptions = exceptions;
+ }
+
+ public void addException(Exception e) {
+ exceptions.add(e);
+ }
+
+ public void throwIfExceptions() throws MultiException {
+ if (!exceptions.isEmpty()) {
+ throw this;
+ }
+ }
+
+ @Override
+ public void printStackTrace()
+ {
+ super.printStackTrace();
+ for (Exception e : exceptions) {
+ e.printStackTrace();
+ }
+ }
+
+
+ /* ------------------------------------------------------------------------------- */
+ /**
+ * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
+ */
+ @Override
+ public void printStackTrace(PrintStream out)
+ {
+ super.printStackTrace(out);
+ for (Exception e : exceptions) {
+ e.printStackTrace(out);
+ }
+ }
+
+ @Override
+ public void printStackTrace(PrintWriter out)
+ {
+ super.printStackTrace(out);
+ for (Exception e : exceptions) {
+ e.printStackTrace(out);
+ }
+ }
+
+ public static void throwIf(String message, List<Exception> exceptions) throws MultiException {
+ if (exceptions != null && !exceptions.isEmpty()) {
+ StringBuilder sb = new StringBuilder(message);
+ sb.append(":");
+ for (Exception e : exceptions) {
+ sb.append("\n\t");
+ sb.append(e.getMessage());
+ }
+ throw new MultiException(sb.toString(), exceptions);
+ }
+ }
+}
Modified: karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java?rev=1310254&r1=1310253&r2=1310254&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java (original)
+++ karaf/branches/karaf-2.3.x/features/command/src/main/java/org/apache/karaf/features/command/RefreshUrlCommand.java Fri Apr 6 09:19:18 2012
@@ -38,16 +38,18 @@ public class RefreshUrlCommand extends F
urls.add(repo.getURI().toString());
}
}
+ List<Exception> exceptions = new ArrayList<Exception>();
for (String strUri : urls) {
try {
URI uri = new URI(strUri);
admin.removeRepository(uri);
admin.addRepository(uri);
} catch (Exception e) {
- System.out.println("Could not refresh Feature Repository:\n" + e.getMessage() );
+ exceptions.add(e);
//get chance to restore previous, fix for KARAF-4
admin.restoreRepository(new URI(strUri));
}
}
+ MultiException.throwIf("Unable to add repositories", exceptions);
}
}