Author: adietish Date: 2011-08-11 06:04:09 -0400 (Thu, 11 Aug 2011) New Revision: 33803 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java Log: [JBIDE-9519] corrected exception handling, added proper logging Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-11 07:08:43 UTC (rev 33802) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.java 2011-08-11 10:04:09 UTC (rev 33803) @@ -91,6 +91,7 @@ public static String CannotSaveServersStartArgs; public static String ExtensionManager_could_not_load_publishers; public static String PublishRenameFailure; + public static String ErrorDisposingLocalJBoss7BehaviorDelegate; static { NLS.initializeMessages(BUNDLE_NAME, Messages.class); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-11 07:08:43 UTC (rev 33802) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/Messages.properties 2011-08-11 10:04:09 UTC (rev 33803) @@ -70,3 +70,4 @@ JMXScannerCanceled=JBossTools was unable to contact the JBoss deployment scanner in a reasonable amount of time. This step has been skipped. ConnectingToServerViaJMX=Connecting to {0} via JMX ExtensionManager_could_not_load_publishers=Could not load publishers +ErrorDisposingLocalJBoss7BehaviorDelegate=Could not dispose LocalJBoss7BehaviorDelegate \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-08-11 07:08:43 UTC (rev 33802) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-08-11 10:04:09 UTC (rev 33803) @@ -11,6 +11,7 @@ package org.jboss.ide.eclipse.as.core.server.internal.v7; import java.text.MessageFormat; + import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IServer; @@ -23,6 +24,7 @@ import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.management.as7.IJBoss7ManagerService; import org.jboss.ide.eclipse.as.management.as7.JBoss7ManagerUtil; +import org.osgi.framework.InvalidSyntaxException; public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate { @@ -77,12 +79,12 @@ public void dispose() { try { JBoss7ManagerUtil.dispose(getService()); - } catch(Exception e) { - // ignore + } catch (InvalidSyntaxException e) { + JBossServerCorePlugin.log(IStatus.ERROR, Messages.ErrorDisposingLocalJBoss7BehaviorDelegate, e); } } - protected IJBoss7ManagerService getService() throws Exception { + protected IJBoss7ManagerService getService() throws InvalidSyntaxException { if (service == null) { this.service = JBoss7ManagerUtil.getService(getServer()); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java 2011-08-11 07:08:43 UTC (rev 33802) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/management/as7/JBoss7ManagerUtil.java 2011-08-11 10:04:09 UTC (rev 33803) @@ -13,12 +13,13 @@ import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.internal.management.as7.Activator; import org.osgi.framework.BundleContext; +import org.osgi.framework.InvalidSyntaxException; public class JBoss7ManagerUtil { private static final String JBOSS7_RUNTIME = "org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$ - public static IJBoss7ManagerService getService(IServer server) throws Exception { + public static IJBoss7ManagerService getService(IServer server) throws InvalidSyntaxException { BundleContext context = Activator.getContext(); JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context, getRequiredVersion(server)); proxy.open();