You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/07/13 23:13:54 UTC
svn commit: r216251 - in /geronimo/trunk/modules:
deployment/src/java/org/apache/geronimo/deployment/
kernel/src/java/org/apache/geronimo/gbean/runtime/
kernel/src/java/org/apache/geronimo/kernel/
kernel/src/java/org/apache/geronimo/kernel/basic/ kerne...
Author: ammulder
Date: Wed Jul 13 14:13:52 2005
New Revision: 216251
URL: http://svn.apache.org/viewcvs?rev=216251&view=rev
Log:
Switch GBeanNotFoundException to ObjectName on Dain's recommendation
Modified:
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/GBeanDataRegistry.java
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/GBeanNotFoundException.java
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java
geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java
Modified: geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/GBeanDataRegistry.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/GBeanDataRegistry.java?rev=216251&r1=216250&r2=216251&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/GBeanDataRegistry.java (original)
+++ geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/GBeanDataRegistry.java Wed Jul 13 14:13:52 2005
@@ -45,7 +45,7 @@
public synchronized GBeanData getGBeanInstance(ObjectName name) throws GBeanNotFoundException {
GBeanData gbeanData = (GBeanData) registry.get(name);
if (gbeanData == null) {
- throw new GBeanNotFoundException(new GBeanName(name));
+ throw new GBeanNotFoundException(name);
}
return gbeanData;
}
Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=216251&r1=216250&r2=216251&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Wed Jul 13 14:13:52 2005
@@ -41,7 +41,6 @@
import org.apache.geronimo.gbean.GOperationSignature;
import org.apache.geronimo.gbean.GReferenceInfo;
import org.apache.geronimo.gbean.InvalidConfigurationException;
-import org.apache.geronimo.gbean.GBeanName;
import org.apache.geronimo.kernel.DependencyManager;
import org.apache.geronimo.kernel.NoSuchAttributeException;
import org.apache.geronimo.kernel.NoSuchOperationException;
@@ -324,7 +323,7 @@
synchronized (this) {
if (dead) {
// someone beat us to the punch... this instance should have never been found in the first place
- throw new GBeanNotFoundException(new GBeanName(objectName));
+ throw new GBeanNotFoundException(objectName);
}
dead = true;
}
Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/GBeanNotFoundException.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/GBeanNotFoundException.java?rev=216251&r1=216250&r2=216251&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/GBeanNotFoundException.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/GBeanNotFoundException.java Wed Jul 13 14:13:52 2005
@@ -16,25 +16,26 @@
*/
package org.apache.geronimo.kernel;
-import org.apache.geronimo.gbean.GBeanName;
+import javax.management.ObjectName;
+
/**
* @version $Rev$ $Date$
*/
public class GBeanNotFoundException extends KernelException {
- private GBeanName gBeanName;
+ private ObjectName gBeanName;
- public GBeanNotFoundException(GBeanName gBeanName) {
+ public GBeanNotFoundException(ObjectName gBeanName) {
super(gBeanName+" not found");
this.gBeanName = gBeanName;
}
- public GBeanNotFoundException(GBeanName gBeanName, Throwable cause) {
+ public GBeanNotFoundException(ObjectName gBeanName, Throwable cause) {
super(gBeanName+" not found", cause);
this.gBeanName = gBeanName;
}
- public GBeanName getGBeanName() {
+ public ObjectName getGBeanName() {
return gBeanName;
}
}
Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java?rev=216251&r1=216250&r2=216251&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicRegistry.java Wed Jul 13 14:13:52 2005
@@ -23,6 +23,7 @@
import java.util.Iterator;
import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
@@ -87,7 +88,11 @@
*/
public synchronized void unregister(GBeanName name) throws GBeanNotFoundException, InternalKernelException {
if (registry.remove(name) == null) {
- throw new GBeanNotFoundException(name);
+ try {
+ throw new GBeanNotFoundException(name.getObjectName());
+ } catch (MalformedObjectNameException e) {
+ throw new InternalKernelException(e);
+ }
}
}
@@ -101,7 +106,11 @@
public synchronized GBeanInstance getGBeanInstance(GBeanName name) throws GBeanNotFoundException {
GBeanInstance instance = (GBeanInstance) registry.get(name);
if (instance == null) {
- throw new GBeanNotFoundException(name);
+ try {
+ throw new GBeanNotFoundException(name.getObjectName());
+ } catch (MalformedObjectNameException e) {
+ throw new InternalKernelException(e);
+ }
}
return instance;
}
Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java?rev=216251&r1=216250&r2=216251&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java (original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/MBeanServerDelegate.java Wed Jul 13 14:13:52 2005
@@ -38,7 +38,6 @@
import javax.management.OperationsException;
import javax.management.QueryExp;
import javax.management.ReflectionException;
-import javax.management.MalformedObjectNameException;
import javax.management.loading.ClassLoaderRepository;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -119,12 +118,8 @@
} catch (NoSuchOperationException e) {
throw new ReflectionException(new NoSuchMethodException(e.getMessage()));
} catch (GBeanNotFoundException e) {
- try {
- if(name.equals(e.getGBeanName().getObjectName())) {
- throw new InstanceNotFoundException(name.getCanonicalName());
- }
- } catch (MalformedObjectNameException e1) {
- throw new MBeanException(e);
+ if(name.equals(e.getGBeanName())) {
+ throw new InstanceNotFoundException(name.getCanonicalName());
}
throw new MBeanException(e);
} catch (InternalKernelException e) {