You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2007/06/15 18:47:26 UTC
svn commit: r547737 - in /geronimo/server/trunk/modules:
geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/
geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/
geronimo-connector/src/main/java/org/ap...
Author: rickmcguire
Date: Fri Jun 15 09:47:19 2007
New Revision: 547737
URL: http://svn.apache.org/viewvc?view=rev&rev=547737
Log:
GERONIMO-3246 Cleanup exception handling so stack traces for first failures are not discarded.
Modified:
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BigDecimalEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BooleanEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ByteEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/CharacterEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DateEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DoubleEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FileEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FloatEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/InetAddressEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/IntegerEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/LongEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ObjectNameEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertiesEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ShortEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URIEditor.java
geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URLEditor.java
geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/LocalXAResource.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResource.java
geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java
geronimo/server/trunk/modules/geronimo-converter/src/main/java/org/apache/geronimo/converter/DOMUtils.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/Adapter.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterEntity.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterProxyFactory.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateful.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateless.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEJBMemento.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHandle.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHomeHandle.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CSSBean.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ClientPolicyFactory.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerPolicyFactory.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerSecurityInterceptor.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameDynamic.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameStatic.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSSLTransportConfig.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionPolicyFactory.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionPolicyFactory.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/ClientContextHolderStub.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/TypeCode.java
geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameEditor.java Fri Jun 15 09:47:19 2007
@@ -34,7 +34,7 @@
try {
return new AbstractName(new URI(getAsText()));
} catch (URISyntaxException e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/AbstractNameQueryEditor.java Fri Jun 15 09:47:19 2007
@@ -34,7 +34,7 @@
try {
return new AbstractNameQuery(new URI(getAsText()));
} catch (URISyntaxException e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BigDecimalEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BigDecimalEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BigDecimalEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BigDecimalEditor.java Fri Jun 15 09:47:19 2007
@@ -35,7 +35,7 @@
return new BigDecimal(getAsText().trim());
} catch (NumberFormatException e) {
// any format errors show up as a NumberFormatException, which we turn into a PropertyEditorException.
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BooleanEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BooleanEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BooleanEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/BooleanEditor.java Fri Jun 15 09:47:19 2007
@@ -31,7 +31,7 @@
return Boolean.valueOf(text);
}
catch (Exception e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ByteEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ByteEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ByteEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ByteEditor.java Fri Jun 15 09:47:19 2007
@@ -31,7 +31,7 @@
return Byte.valueOf(text);
}
catch (Exception e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/CharacterEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/CharacterEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/CharacterEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/CharacterEditor.java Fri Jun 15 09:47:19 2007
@@ -34,7 +34,7 @@
return new Character(text.toCharArray()[0]);
}
catch (Exception e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DateEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DateEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DateEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DateEditor.java Fri Jun 15 09:47:19 2007
@@ -41,7 +41,7 @@
return formatter.parse(getAsText().trim());
} catch (ParseException e) {
// any format errors show up as a ParseException, which we turn into a PropertyEditorException.
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DoubleEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DoubleEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DoubleEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/DoubleEditor.java Fri Jun 15 09:47:19 2007
@@ -31,7 +31,7 @@
return Double.valueOf(text);
}
catch (Exception e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FileEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FileEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FileEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FileEditor.java Fri Jun 15 09:47:19 2007
@@ -41,7 +41,7 @@
return new File(getAsText()).getCanonicalFile();
}
catch (IOException e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FloatEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FloatEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FloatEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/FloatEditor.java Fri Jun 15 09:47:19 2007
@@ -31,7 +31,7 @@
return Float.valueOf(text);
}
catch (Exception e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/InetAddressEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/InetAddressEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/InetAddressEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/InetAddressEditor.java Fri Jun 15 09:47:19 2007
@@ -30,7 +30,7 @@
try {
return InetAddress.getByName(getAsText());
} catch (UnknownHostException e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/IntegerEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/IntegerEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/IntegerEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/IntegerEditor.java Fri Jun 15 09:47:19 2007
@@ -31,7 +31,7 @@
return Integer.valueOf(text);
}
catch (Exception e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/LongEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/LongEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/LongEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/LongEditor.java Fri Jun 15 09:47:19 2007
@@ -31,7 +31,7 @@
return Long.valueOf(text);
}
catch (Exception e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/MapEditor.java Fri Jun 15 09:47:19 2007
@@ -47,7 +47,7 @@
setValue((Map)p);
} catch (IOException e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ObjectNameEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ObjectNameEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ObjectNameEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ObjectNameEditor.java Fri Jun 15 09:47:19 2007
@@ -41,7 +41,7 @@
return new ObjectName(getAsText());
}
catch (MalformedObjectNameException e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertiesEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertiesEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertiesEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/PropertiesEditor.java Fri Jun 15 09:47:19 2007
@@ -49,7 +49,7 @@
bundle.load(stream);
} catch (IOException e) {
// any errors here are just a property exception
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
return bundle;
}
@@ -72,7 +72,7 @@
((Properties) value).store(baos, null);
} catch (IOException e) {
// any errors here are just a property exception
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
return baos.toString();
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ShortEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ShortEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ShortEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/ShortEditor.java Fri Jun 15 09:47:19 2007
@@ -31,7 +31,7 @@
return Short.valueOf(text);
}
catch (Exception e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URIEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URIEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URIEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URIEditor.java Fri Jun 15 09:47:19 2007
@@ -32,7 +32,7 @@
try {
return new URI(getAsText());
} catch (URISyntaxException e) {
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URLEditor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URLEditor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URLEditor.java (original)
+++ geronimo/server/trunk/modules/geronimo-common/src/main/java/org/apache/geronimo/common/propertyeditor/URLEditor.java Fri Jun 15 09:47:19 2007
@@ -47,7 +47,7 @@
}
} catch (Exception e) {
// any error here is returned as a property editor exception.
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
return url;
@@ -63,7 +63,7 @@
return new File(getAsText()).toURI().toURL();
} catch (MalformedURLException e) {
// any error here is returned as a property editor exception.
- throw new PropertyEditorException(e);
+ throw new PropertyEditorException(e.getMessage(), e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/AdminObjectRefBuilder.java Fri Jun 15 09:47:19 2007
@@ -152,7 +152,7 @@
getJndiContextMap(componentContext).put(ENV + name, ref);
}
} catch (UnresolvedReferenceException e) {
- throw new DeploymentException("Unable to resolve resource env reference '" + name + "' (" + (e.isMultiple() ? "found multiple matching resources" : "no matching resources found") + ")");
+ throw new DeploymentException("Unable to resolve resource env reference '" + name + "' (" + (e.isMultiple() ? "found multiple matching resources" : "no matching resources found") + ")", e);
}
}
@@ -255,7 +255,7 @@
try {
localConfiguration.findGBean(containerId);
} catch (GBeanNotFoundException e) {
- throw new DeploymentException("Can not resolve admin object ref " + containerId + " in configuration " + localConfiguration.getId());
+ throw new DeploymentException("Can not resolve admin object ref " + containerId + " in configuration " + localConfiguration.getId(), e);
}
return new ResourceReference(module.getConfigId(), containerId, iface);
}
Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Fri Jun 15 09:47:19 2007
@@ -242,7 +242,7 @@
XmlBeansUtil.validateDD(gerConnector);
} catch (XmlException e) {
- throw new DeploymentException(e);
+ throw new DeploymentException("Could not parse module descriptor", e);
}
EnvironmentType environmentType = gerConnector.getEnvironment();
@@ -902,7 +902,7 @@
try {
instanceName = configuration.findGBean(resourceAdapterInstanceQuery);
} catch (GBeanNotFoundException e) {
- throw new DeploymentException("No resource adapter instance gbean found matching " + resourceAdapterInstanceQuery + " from configuration " + configuration.getId());
+ throw new DeploymentException("No resource adapter instance gbean found matching " + resourceAdapterInstanceQuery + " from configuration " + configuration.getId(), e);
}
String moduleName = (String) instanceName.getName().get(NameFactory.RESOURCE_ADAPTER_MODULE);
Map moduleNameMap = new HashMap(instanceName.getName());
@@ -917,7 +917,7 @@
try {
resourceModuleData = configuration.findGBeanData(nameQuery);
} catch (GBeanNotFoundException e) {
- throw new DeploymentException("No resource module gbean found matching " + nameQuery + " from configuration " + configuration.getId());
+ throw new DeploymentException("No resource module gbean found matching " + nameQuery + " from configuration " + configuration.getId(), e);
}
Map activationSpecInfos = (Map) resourceModuleData.getAttribute("activationSpecInfoMap");
if (activationSpecInfos == null) {
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractSinglePoolConnectionInterceptor.java Fri Jun 15 09:47:19 2007
@@ -88,7 +88,7 @@
}
} catch (InterruptedException ie) {
- throw new ResourceException("Interrupted while requesting permit!");
+ throw new ResourceException("Interrupted while requesting permit.", ie);
} // end of try-catch
}
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/LocalXAResource.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/LocalXAResource.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/LocalXAResource.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/LocalXAResource.java Fri Jun 15 09:47:19 2007
@@ -50,7 +50,7 @@
public void commit(Xid xid, boolean flag) throws XAException {
if (this.xid == null || !this.xid.equals(xid)) {
- throw new XAException();
+ throw new XAException("Invalid Xid");
}
try {
localTransaction.commit();
@@ -80,7 +80,7 @@
public void rollback(Xid xid) throws XAException {
if (this.xid == null || !this.xid.equals(xid)) {
- throw new XAException();
+ throw new XAException("Invalid Xid");
}
try {
localTransaction.rollback();
@@ -119,7 +119,7 @@
public void end(Xid xid, int flag) throws XAException {
if (xid != this.xid) {
- throw new XAException();
+ throw new XAException("Invalid Xid");
}
//we could keep track of if the flag is TMSUCCESS...
}
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResource.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResource.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResource.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/transactionlog/LogXAResource.java Fri Jun 15 09:47:19 2007
@@ -69,7 +69,7 @@
public void rollback(Xid xid) throws XAException {
if (this.xid == null || !this.xid.equals(xid)) {
- throw new XAException();
+ throw new XAException("Invalid Xid");
}
try {
localTransaction.rollback();
Modified: geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/work/WorkerContext.java Fri Jun 15 09:47:19 2007
@@ -300,7 +300,7 @@
} catch (SystemException e) {
throw new WorkCompletedException("Transaction import failed for xid " + executionContext.getXid(), WorkCompletedException.TX_RECREATE_FAILED).initCause(e);
} catch (ImportedTransactionActiveException e) {
- throw new WorkCompletedException("Transaction already active for xid " + executionContext.getXid(), WorkCompletedException.TX_CONCURRENT_WORK_DISALLOWED);
+ throw new WorkCompletedException("Transaction already active for xid " + executionContext.getXid(), WorkCompletedException.TX_CONCURRENT_WORK_DISALLOWED).initCause(e);
}
try {
adaptee.run();
Modified: geronimo/server/trunk/modules/geronimo-converter/src/main/java/org/apache/geronimo/converter/DOMUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-converter/src/main/java/org/apache/geronimo/converter/DOMUtils.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-converter/src/main/java/org/apache/geronimo/converter/DOMUtils.java (original)
+++ geronimo/server/trunk/modules/geronimo-converter/src/main/java/org/apache/geronimo/converter/DOMUtils.java Fri Jun 15 09:47:19 2007
@@ -29,7 +29,7 @@
public static String getChildText(Element parent, String childName) {
NodeList list = parent.getElementsByTagName(childName);
if(list.getLength() > 1) {
- throw new IllegalStateException();
+ throw new IllegalStateException("Multiple child elements with name " + childName);
} else if(list.getLength() == 0) {
return null;
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/Adapter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/Adapter.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/Adapter.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/Adapter.java Fri Jun 15 09:47:19 2007
@@ -39,13 +39,13 @@
* @version $Revision: 497125 $ $Date: 2007-01-17 10:51:30 -0800 (Wed, 17 Jan 2007) $
*/
public abstract class Adapter implements RefGenerator {
- private final EjbDeployment deployment;
+ protected final EjbDeployment deployment;
protected final POA homePOA;
protected final ORB orb;
- private final NamingContextExt initialContext;
- private final byte[] home_id;
- private final org.omg.CORBA.Object homeReference;
- private final TSSLink tssLink;
+ protected final NamingContextExt initialContext;
+ protected final byte[] home_id;
+ protected final org.omg.CORBA.Object homeReference;
+ protected final TSSLink tssLink;
protected Adapter(TSSLink tssLink, ORB orb, POA parentPOA, Policy securityPolicy) throws CORBAException {
this.tssLink = tssLink;
@@ -97,7 +97,7 @@
currentContext.rebind(nc, homeReference);
}
} catch (Exception e) {
- throw new CORBAException(e);
+ throw new CORBAException("Unable to activate EJB as CORBA object.", e);
}
}
@@ -140,7 +140,7 @@
homePOA.deactivate_object(home_id);
homePOA.destroy(true, true);
} catch (Exception e) {
- throw new CORBAException(e);
+ throw new CORBAException("Error deactivating EJB as CORBA object", e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterEntity.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterEntity.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterEntity.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterEntity.java Fri Jun 15 09:47:19 2007
@@ -82,7 +82,7 @@
StandardServant servant = new StandardServant(orb, InterfaceType.EJB_OBJECT, tssLink.getDeployment());
referenceInterface = servant._all_interfaces(null, null)[0];
} catch (Exception e) {
- throw new CORBAException(e);
+ throw new CORBAException("Error activating EJB as CORBA object", e);
}
}
@@ -108,7 +108,7 @@
os.close();
} catch (IOException e) {
log.error("Could not serialize deployment info for " + deploymentId, e);
- throw new CORBAException(e);
+ throw new CORBAException("Could not serialize deployment info for " + deploymentId, e);
}
return poa.create_reference_with_id(bytes, referenceInterface);
}
@@ -128,7 +128,7 @@
return new StandardServant(getOrb(), InterfaceType.EJB_OBJECT, deployment, pk);
} catch (IOException e) {
// if we can't deserialize, then this object can't exist in this process
- throw new OBJECT_NOT_EXIST(0, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+ throw (OBJECT_NOT_EXIST)new OBJECT_NOT_EXIST(0, org.omg.CORBA.CompletionStatus.COMPLETED_NO).initCause(e);
} catch (Exception e) {
log.error("Exception during dispatch to method " + operation + " in bean " + pk, e);
return null;
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterProxyFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterProxyFactory.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterProxyFactory.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterProxyFactory.java Fri Jun 15 09:47:19 2007
@@ -105,25 +105,25 @@
return methodProxy.invoke(delegate.getDelegate(), args);
} catch (TransactionRolledbackException e) {
log.debug("TransactionRolledbackException", e);
- throw new TRANSACTION_ROLLEDBACK(e.toString());
+ throw new TRANSACTION_ROLLEDBACK(e.toString()).initCause(e);
} catch (TransactionRequiredException e) {
log.debug("TransactionRequiredException", e);
- throw new TRANSACTION_REQUIRED(e.toString());
+ throw new TRANSACTION_REQUIRED(e.toString()).initCause(e);
} catch (InvalidTransactionException e) {
log.debug("InvalidTransactionException", e);
- throw new INVALID_TRANSACTION(e.toString());
+ throw new INVALID_TRANSACTION(e.toString()).initCause(e);
} catch (NoSuchObjectException e) {
log.debug("NoSuchObjectException", e);
- throw new OBJECT_NOT_EXIST(e.toString());
+ throw new OBJECT_NOT_EXIST(e.toString()).initCause(e);
} catch (AccessException e) {
log.debug("AccessException", e);
- throw new NO_PERMISSION(e.toString());
+ throw new NO_PERMISSION(e.toString()).initCause(e);
} catch (MarshalException e) {
log.debug("MarshalException", e);
- throw new MARSHAL(e.toString());
+ throw new MARSHAL(e.toString()).initCause(e);
} catch (RemoteException e) {
log.debug("RemoteException", e);
- throw new UNKNOWN(e.toString());
+ throw new UNKNOWN(e.toString()).initCause(e);
} finally {
Thread.currentThread().setContextClassLoader(savedCL);
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateful.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateful.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateful.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateful.java Fri Jun 15 09:47:19 2007
@@ -80,7 +80,7 @@
StandardServant servant = new StandardServant(orb, InterfaceType.EJB_OBJECT, tssLink.getDeployment());
referenceInterface = servant._all_interfaces(null, null)[0];
} catch (Exception e) {
- throw new CORBAException(e);
+ throw new CORBAException("Unable to activate EJB "+ deploymentId +" as CORBA object", e);
}
}
@@ -106,7 +106,7 @@
os.close();
} catch (IOException e) {
log.error("Could not serialize deployment info for " + deploymentId, e);
- throw new CORBAException(e);
+ throw new CORBAException("Could not serialize deployment info for " + deploymentId, e);
}
return poa.create_reference_with_id(bytes, referenceInterface);
}
@@ -126,7 +126,7 @@
return new StandardServant(getOrb(), InterfaceType.EJB_OBJECT, deployment, pk);
} catch (IOException e) {
// if we can't deserialize, then this object can't exist in this process
- throw new OBJECT_NOT_EXIST(0, org.omg.CORBA.CompletionStatus.COMPLETED_NO);
+ throw (OBJECT_NOT_EXIST)new OBJECT_NOT_EXIST(0, org.omg.CORBA.CompletionStatus.COMPLETED_NO).initCause(e);
} catch (Exception e) {
log.error("Exception during dispatch to method " + operation + " in bean " + pk, e);
return null;
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateless.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateless.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateless.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/AdapterStateless.java Fri Jun 15 09:47:19 2007
@@ -63,8 +63,7 @@
poa.activate_object_with_id(object_id = tssLink.getContainerId().getBytes(), servant);
objectReference = poa.servant_to_reference(servant);
} catch (Exception e) {
- e.printStackTrace();
- throw new CORBAException(e);
+ throw new CORBAException("Unable to activate EJB "+ tssLink.getContainerId() +" as CORBA object", e);
}
}
@@ -74,9 +73,9 @@
poa.destroy(true, true);
super.stop();
} catch (ObjectNotActive e) {
- throw new CORBAException(e);
+ throw new CORBAException("Unable to activate EJB "+ tssLink.getContainerId() +" as CORBA object", e);
} catch (WrongPolicy e) {
- throw new CORBAException(e);
+ throw new CORBAException("Unable to activate EJB "+ tssLink.getContainerId() +" as CORBA object", e);
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEJBMemento.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEJBMemento.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEJBMemento.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAEJBMemento.java Fri Jun 15 09:47:19 2007
@@ -60,7 +60,7 @@
ORB orb = (ORB) context.lookup("java:comp/ORB");
return orb;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHandle.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHandle.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHandle.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHandle.java Fri Jun 15 09:47:19 2007
@@ -81,7 +81,7 @@
ORB orb = (ORB) context.lookup("java:comp/ORB");
return orb;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
@@ -91,7 +91,7 @@
HandleDelegate handleDelegate = (HandleDelegate) context.lookup("java:comp/HandleDelegate");
return handleDelegate;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL("Could not find handle delegate in jndi at java:comp/HandleDelegate", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL("Could not find handle delegate in jndi at java:comp/HandleDelegate", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHomeHandle.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHomeHandle.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHomeHandle.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CORBAHomeHandle.java Fri Jun 15 09:47:19 2007
@@ -84,7 +84,7 @@
ORB orb = (ORB) context.lookup("java:comp/ORB");
return orb;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
@@ -94,7 +94,7 @@
HandleDelegate handleDelegate = (HandleDelegate) context.lookup("java:comp/HandleDelegate");
return handleDelegate;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL("Could not find handle delegate in jndi at java:comp/HandleDelegate", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL("Could not find handle delegate in jndi at java:comp/HandleDelegate", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CSSBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CSSBean.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CSSBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CSSBean.java Fri Jun 15 09:47:19 2007
@@ -168,7 +168,7 @@
throw new InvalidConfigurationException("CORBA usage requires Yoko CORBA spec classes in java.endorsed.dirs classpath", e);
} catch (UserException ue) {
log.error(description + " - Looking up home", ue);
- throw new RuntimeException(ue);
+ throw new RuntimeException(description + " - Looking up home", ue);
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/CorbaApplicationServer.java Fri Jun 15 09:47:19 2007
@@ -42,7 +42,7 @@
EJBObject ejbObject = (EJBObject) PortableRemoteObject.narrow(object, EJBObject.class);
return ejbObject;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL(e.getClass().getName() + " thrown while marshaling the reply: " + e.getMessage(), 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL(e.getClass().getName() + " thrown while marshaling the reply: " + e.getMessage(), 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
@@ -56,7 +56,7 @@
org.omg.CORBA.Object object = refGenerator.genObjectReference(proxyInfo.getPrimaryKey());
return object;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL(e.getClass().getName() + " thrown while marshaling the reply: " + e.getMessage(), 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL(e.getClass().getName() + " thrown while marshaling the reply: " + e.getMessage(), 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
@@ -67,7 +67,7 @@
EJBHome ejbHome = (EJBHome) PortableRemoteObject.narrow(home, EJBHome.class);
return ejbHome;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL(e.getClass().getName() + " thrown while marshaling the reply: " + e.getMessage(), 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL(e.getClass().getName() + " thrown while marshaling the reply: " + e.getMessage(), 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
@@ -116,7 +116,7 @@
ORB orb = (ORB) context.lookup("java:comp/ORB");
return orb;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/StandardServant.java Fri Jun 15 09:47:19 2007
@@ -125,7 +125,7 @@
try {
enc = EnterpriseNamingContext.createEnterpriseNamingContext(componentContext);
} catch (NamingException e) {
- throw new RuntimeException(e);
+ throw new RuntimeException("Error creating standard servant naming context", e);
}
}
@@ -213,7 +213,7 @@
throw new RemoteException("Handle does not hold a " + remoteInterface.getName());
}
} catch (ClassCastException e) {
- throw new RemoteException("Handle does not hold a " + remoteInterface.getName());
+ throw new RemoteException("Handle does not hold a " + remoteInterface.getName(), e);
}
} else {
try {
@@ -264,38 +264,36 @@
}
} catch (TransactionRolledbackException e) {
log.debug("TransactionRolledbackException", e);
- throw new TRANSACTION_ROLLEDBACK(e.toString());
+ throw (SystemException)new TRANSACTION_ROLLEDBACK(e.toString()).initCause(e);
} catch (TransactionRequiredException e) {
log.debug("TransactionRequiredException", e);
- throw new TRANSACTION_REQUIRED(e.toString());
+ throw (SystemException)new TRANSACTION_REQUIRED(e.toString()).initCause(e);
} catch (InvalidTransactionException e) {
log.debug("InvalidTransactionException", e);
- throw new INVALID_TRANSACTION(e.toString());
+ throw (SystemException)new INVALID_TRANSACTION(e.toString()).initCause(e);
} catch (NoSuchObjectException e) {
log.debug("NoSuchObjectException", e);
- throw new OBJECT_NOT_EXIST(e.toString());
+ throw (SystemException)new OBJECT_NOT_EXIST(e.toString()).initCause(e);
} catch (AccessException e) {
log.debug("AccessException", e);
- throw new NO_PERMISSION(e.toString());
+ throw (SystemException)new NO_PERMISSION(e.toString()).initCause(e);
} catch (MarshalException e) {
log.debug("MarshalException", e);
- throw new MARSHAL(e.toString());
+ throw (SystemException)new MARSHAL(e.toString()).initCause(e);
} catch (RemoteException e) {
log.debug("RemoteException", e);
- e.printStackTrace();
- throw new UnknownException(e);
+ throw (SystemException)new UnknownException(e).initCause(e);
} catch (RuntimeException e) {
log.debug("RuntimeException", e);
- e.printStackTrace();
- RemoteException remoteException = new RemoteException(e.getClass().getName() + " thrown from " + ejbDeployment.getDeploymentId() + ": " + e.getMessage());
+ RemoteException remoteException = new RemoteException(e.getClass().getName() + " thrown from " + ejbDeployment.getDeploymentId() + ": " + e.getMessage(), e);
throw new UnknownException(remoteException);
} catch (Error e) {
log.debug("Error", e);
- RemoteException remoteException = new RemoteException(e.getClass().getName() + " thrown from " + ejbDeployment.getDeploymentId() + ": " + e.getMessage());
+ RemoteException remoteException = new RemoteException(e.getClass().getName() + " thrown from " + ejbDeployment.getDeploymentId() + ": " + e.getMessage(), e);
throw new UnknownException(remoteException);
} catch (Throwable e) {
log.warn("Unexpected throwable", e);
- throw new UNKNOWN("Unknown exception type " + e.getClass().getName() + ": " + e.getMessage());
+ throw (SystemException)new UNKNOWN("Unknown exception type " + e.getClass().getName() + ": " + e.getMessage()).initCause(e);
}
// creat the output stream
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ClientPolicyFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ClientPolicyFactory.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ClientPolicyFactory.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ClientPolicyFactory.java Fri Jun 15 09:47:19 2007
@@ -33,7 +33,9 @@
public final static int POLICY_TYPE = 0x41534601;
public Policy create_policy(int type, Any value) throws PolicyError {
- if (type != POLICY_TYPE) throw new PolicyError();
+ if (type != POLICY_TYPE) {
+ throw new PolicyError(org.omg.CORBA.BAD_POLICY.value);
+ }
return new ClientPolicy((CSSConfig) value.extract_Value());
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerPolicyFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerPolicyFactory.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerPolicyFactory.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerPolicyFactory.java Fri Jun 15 09:47:19 2007
@@ -31,7 +31,9 @@
public final static int POLICY_TYPE = 0x41534600;
public Policy create_policy(int type, Any value) throws PolicyError {
- if (type != POLICY_TYPE) throw new PolicyError();
+ if (type != POLICY_TYPE) {
+ throw new PolicyError(org.omg.CORBA.BAD_POLICY.value);
+ }
return new ServerPolicy((ServerPolicy.Config) value.extract_Value());
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerSecurityInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerSecurityInterceptor.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerSecurityInterceptor.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/ServerSecurityInterceptor.java Fri Jun 15 09:47:19 2007
@@ -126,10 +126,10 @@
if (log.isDebugEnabled()) log.debug("INV_POLICY");
} catch (TypeMismatch tm) {
log.error("TypeMismatch thrown", tm);
- throw new MARSHAL("TypeMismatch thrown: " + tm);
+ throw (MARSHAL)new MARSHAL("TypeMismatch thrown: " + tm).initCause(tm);
} catch (FormatMismatch fm) {
log.error("FormatMismatch thrown", fm);
- throw new MARSHAL("FormatMismatch thrown: " + fm);
+ throw (MARSHAL)new MARSHAL("FormatMismatch thrown: " + fm).initCause(fm);
} catch (SASException e) {
log.error("SASException", e);
SASReplyManager.setSASReply(ri.request_id(), generateContextError(e, contextId));
@@ -237,7 +237,7 @@
}
} catch (InvalidTypeForEncoding itfe) {
log.error("InvalidTypeForEncoding thrown", itfe);
- throw new INTERNAL("InvalidTypeForEncoding thrown: " + itfe);
+ throw (INTERNAL)new INTERNAL("InvalidTypeForEncoding thrown: " + itfe).initCause(itfe);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameDynamic.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameDynamic.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameDynamic.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameDynamic.java Fri Jun 15 09:47:19 2007
@@ -104,7 +104,7 @@
try {
encoding = Util.getCodec().encode_value(any);
} catch (InvalidTypeForEncoding itfe) {
- throw new IllegalStateException("Unable to encode principal name '" + principalName + "' " + itfe);
+ throw new IllegalStateException("Unable to encode principal name '" + principalName + "' " + itfe, itfe);
}
token = new IdentityToken();
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameStatic.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameStatic.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameStatic.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/css/CSSSASITTPrincipalNameStatic.java Fri Jun 15 09:47:19 2007
@@ -55,7 +55,7 @@
try {
encoding = Util.getCodec().encode_value(any);
} catch (InvalidTypeForEncoding itfe) {
- throw new IllegalStateException("Unable to encode principal name '" + name + "' " + itfe);
+ throw new IllegalStateException("Unable to encode principal name '" + name + "' " + itfe, itfe);
}
token = new IdentityToken();
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSSLTransportConfig.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSSLTransportConfig.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSSLTransportConfig.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/security/config/tss/TSSSSLTransportConfig.java Fri Jun 15 09:47:19 2007
@@ -153,7 +153,7 @@
} catch (SSLPeerUnverifiedException e) {
if ((requires & EstablishTrustInClient.value) != 0) {
if (log.isDebugEnabled()) log.debug("Unverified peer, throwing exception");
- throw new SASException(1);
+ throw new SASException(1, e);
}
if (log.isDebugEnabled()) log.debug("Unverified peer, returning null");
return null;
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionPolicyFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionPolicyFactory.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionPolicyFactory.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ClientTransactionPolicyFactory.java Fri Jun 15 09:47:19 2007
@@ -29,8 +29,8 @@
public final static int POLICY_TYPE = 0x41534603;
public Policy create_policy(int type, Any value) throws PolicyError {
- if (type != POLICY_TYPE){
- throw new PolicyError();
+ if (type != POLICY_TYPE) {
+ throw new PolicyError(org.omg.CORBA.BAD_POLICY.value);
}
return new ClientTransactionPolicy(((ClientTransactionPolicyConfig)value.extract_Value()));
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionPolicyFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionPolicyFactory.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionPolicyFactory.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/transaction/ServerTransactionPolicyFactory.java Fri Jun 15 09:47:19 2007
@@ -29,8 +29,8 @@
public final static int POLICY_TYPE = 0x41534602;
public Policy create_policy(int type, Any value) throws PolicyError {
- if (type != POLICY_TYPE){
- throw new PolicyError();
+ if (type != POLICY_TYPE) {
+ throw new PolicyError(org.omg.CORBA.BAD_POLICY.value);
}
return new ServerTransactionPolicy((ServerTransactionPolicyConfig) value.extract_Value());
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/ClientContextHolderStub.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/ClientContextHolderStub.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/ClientContextHolderStub.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/ClientContextHolderStub.java Fri Jun 15 09:47:19 2007
@@ -43,7 +43,7 @@
ORB orb = (ORB) context.lookup("java:comp/ORB");
return orb;
} catch (Throwable e) {
- throw new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
+ throw (org.omg.CORBA.MARSHAL)new org.omg.CORBA.MARSHAL("Could not find ORB in jndi at java:comp/ORB", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES).initCause(e);
}
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/TypeCode.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/TypeCode.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/TypeCode.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/TypeCode.java Fri Jun 15 09:47:19 2007
@@ -199,11 +199,11 @@
}
catch (org.omg.CORBA.TypeCodePackage.BadKind ex)
{
- throw new org.omg.CORBA.UNKNOWN(ex.toString());
+ throw (org.omg.CORBA.UNKNOWN)new org.omg.CORBA.UNKNOWN(ex.toString()).initCause(ex);
}
catch (org.omg.CORBA.TypeCodePackage.Bounds ex)
{
- throw new org.omg.CORBA.UNKNOWN(ex.toString());
+ throw (org.omg.CORBA.UNKNOWN)new org.omg.CORBA.UNKNOWN(ex.toString()).initCause(ex);
}
}
Modified: geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java?view=diff&rev=547737&r1=547736&r2=547737
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java (original)
+++ geronimo/server/trunk/modules/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java Fri Jun 15 09:47:19 2007
@@ -134,13 +134,13 @@
}
} catch (CORBAException e) {
log.error("Encountered unknown local invocation handler of type " + servantType + ":" + deploymentId);
- throw new MARSHAL("Internal server error while marshaling the reply", 0, CompletionStatus.COMPLETED_YES);
+ throw (MARSHAL)new MARSHAL("Internal server error while marshaling the reply", 0, CompletionStatus.COMPLETED_YES).initCause(e);
}
}
delegate.writeRemoteObject(out, obj);
} catch (Throwable e) {
log.error("Received unexpected exception while marshaling an object reference:", e);
- throw new MARSHAL("Internal server error while marshaling the reply", 0, CompletionStatus.COMPLETED_YES);
+ throw (MARSHAL)new MARSHAL("Internal server error while marshaling the reply", 0, CompletionStatus.COMPLETED_YES).initCause(e);
}
}
@@ -258,10 +258,10 @@
}
} catch (CORBAException e) {
log.error("Encountered unknown local invocation handler of type " + proxy.getClass().getSuperclass() + ":" + deploymentId);
- throw new MARSHAL("Encountered unknown local invocation handler of type " + proxy.getClass().getSuperclass() + ":" + deploymentId, 0, CompletionStatus.COMPLETED_YES);
+ throw (MARSHAL)new MARSHAL("Encountered unknown local invocation handler of type " + proxy.getClass().getSuperclass() + ":" + deploymentId, 0, CompletionStatus.COMPLETED_YES).initCause(e);
} catch (RemoteException e) {
log.error("Unable to get primary key from bean from bean of type " + proxy.getClass().getSuperclass() + ":" + deploymentId);
- throw new MARSHAL("Unable to get primary key from bean from bean of type " + proxy.getClass().getSuperclass() + ":" + deploymentId, 0, CompletionStatus.COMPLETED_YES);
+ throw (MARSHAL)new MARSHAL("Unable to get primary key from bean from bean of type " + proxy.getClass().getSuperclass() + ":" + deploymentId, 0, CompletionStatus.COMPLETED_YES).initCause(e);
}
}
}