[jboss-svn-commits] JBL Code SVN: r26848 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 5 08:13:14 EDT 2009
Author: jhalliday
Date: 2009-06-05 08:13:14 -0400 (Fri, 05 Jun 2009)
New Revision: 26848
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/txojPropertyManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/agent/JBossAgentImpl.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java
labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/plugins/io/XMLFilePlugin.java
Log:
Fixed ExceptionInInitializerError usage. JBTM-565
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/common/arjPropertyManager.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -67,9 +67,7 @@
}
catch (Exception e)
{
- ExceptionInInitializerError error = new ExceptionInInitializerError(e.toString());
- error.initCause(e);
- throw error;
+ throw new ExceptionInInitializerError(e);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/LogStore.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -1727,7 +1727,7 @@
}
catch (final Exception ex)
{
- throw new ExceptionInInitializerError(ex.toString());
+ throw new ExceptionInInitializerError(ex);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/txojPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/txojPropertyManager.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/classes/com/arjuna/ats/txoj/common/txojPropertyManager.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -1,20 +1,20 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags.
* See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * full listing of individual contributors.
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
* of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public License,
* v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -69,7 +69,7 @@
}
catch (Exception e)
{
- throw new ExceptionInInitializerError(e.toString());
+ throw new ExceptionInInitializerError(e);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/common/jtsPropertyManager.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -1,8 +1,8 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * See the copyright.txt in the distribution for a full listing
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
* of individual contributors.
* This copyrighted material is made available to anyone wishing to use,
* modify, copy, or redistribute it subject to the terms and conditions
@@ -14,7 +14,7 @@
* v.2.1 along with this distribution; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
- *
+ *
* (C) 2005-2006,
* @author JBoss Inc.
*/
@@ -56,9 +56,9 @@
*/
propertyManager = PropertyManagerFactory.getPropertyManager("com.arjuna.ats.propertymanager", "jts");
-
+
String propertiesFilename = System.getProperty(Environment.PROPERTIES_FILE);
-
+
if (propertiesFilename == null)
propertiesFilename = Configuration.propertiesFile();
@@ -68,7 +68,7 @@
}
catch (Exception e)
{
- throw new ExceptionInInitializerError(e.toString());
+ throw new ExceptionInInitializerError(e);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/ORBInfo.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -184,13 +184,10 @@
{
if (opLogger.loggerI18N.isFatalEnabled())
{
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.ORBInfo.unsupportedorb" );
+ opLogger.loggerI18N.fatal( "com.arjuna.orbportability.ORBInfo.unsupportedorb", joe);
}
- ExceptionInInitializerError exceptionInInitializerError =
- new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.ORBInfo.unsupportedorb"));
- exceptionInInitializerError.initCause(joe);
- throw exceptionInInitializerError;
+ throw new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.ORBInfo.unsupportedorb"));
}
}
@@ -211,11 +208,9 @@
new Object[] { e } );
}
- ExceptionInInitializerError exceptionInInitializerError = new ExceptionInInitializerError(
+ throw new ExceptionInInitializerError(
MessageFormat.format(opLogger.logMesg.getString("com.arjuna.orbportability.ORBInfo.creationfailed"),
new Object[] { e } ));
- exceptionInInitializerError.initCause(e);
- throw exceptionInInitializerError;
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/common/opPropertyManager.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -67,9 +67,7 @@
}
catch (Exception e)
{
- ExceptionInInitializerError exceptionInInitializerError = new ExceptionInInitializerError(e.toString());
- exceptionInInitializerError.initCause(e);
- throw exceptionInInitializerError;
+ throw new ExceptionInInitializerError(e);
}
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -154,12 +154,9 @@
{
if (opLogger.loggerI18N.isFatalEnabled())
{
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.nosupportedorb" );
+ opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.nosupportedorb", je );
}
- ExceptionInInitializerError exceptionInInitializerError =
- new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.oa.core.OA.nosupportedorb") );
- exceptionInInitializerError.initCause(je);
- throw exceptionInInitializerError;
+ throw new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.oa.core.OA.nosupportedorb") );
}
}
}
@@ -181,13 +178,10 @@
if (opLogger.loggerI18N.isFatalEnabled())
{
opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.caughtexception",
- new Object[] { e } );
+ new Object[] { e } , e);
}
- ExceptionInInitializerError exceptionInInitializerError =
- new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.oa.core.OA.caughtexception") );
- exceptionInInitializerError.initCause(e);
- throw exceptionInInitializerError;
+ throw new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.oa.core.OA.caughtexception") );
}
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/orb/core/ORB.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -138,13 +138,10 @@
if (opLogger.loggerI18N.isFatalEnabled())
{
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.orb.core.ORB.unsupportedorb" );
+ opLogger.loggerI18N.fatal( "com.arjuna.orbportability.orb.core.ORB.unsupportedorb", je );
}
- ExceptionInInitializerError exceptionInInitializerError =
- new ExceptionInInitializerError(opLogger.logMesg.getString("com.arjuna.orbportability.orb.core.ORB.unsupportedorb"));
- exceptionInInitializerError.initCause(je);
- throw exceptionInInitializerError;
+ throw new ExceptionInInitializerError(opLogger.logMesg.getString("com.arjuna.orbportability.orb.core.ORB.unsupportedorb"));
}
}
}
@@ -166,13 +163,10 @@
if (opLogger.loggerI18N.isFatalEnabled())
{
opLogger.loggerI18N.fatal( "com.arjuna.orbportability.orb.core.ORB.caughtexception",
- new Object[] { e } );
+ new Object[] { e }, e );
}
- ExceptionInInitializerError exceptionInInitializerError =
- new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.orb.core.ORB.caughtexception") );
- exceptionInInitializerError.initCause(e);
- throw exceptionInInitializerError;
+ throw new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.orb.core.ORB.caughtexception") );
}
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/agent/JBossAgentImpl.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/agent/JBossAgentImpl.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/agent/JBossAgentImpl.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -65,9 +65,7 @@
}
catch (final NamingException ne)
{
- ExceptionInInitializerError exceptionInInitializerError = new ExceptionInInitializerError("Failed to initialize naming context: " + ne);
- exceptionInInitializerError.initCause(ne);
- throw exceptionInInitializerError;
+ throw new ExceptionInInitializerError(ne);
}
RMIAdaptor adaptor = null ;
@@ -83,9 +81,7 @@
}
catch (final NamingException ne2)
{
- ExceptionInInitializerError exceptionInInitializerError = new ExceptionInInitializerError("Failed to retrieve reference to remote MBean server: " + ne2);
- exceptionInInitializerError.initCause(ne);
- throw exceptionInInitializerError;
+ throw new ExceptionInInitializerError(ne2);
}
}
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/commonPropertyManager.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -62,9 +62,7 @@
}
catch (Exception e)
{
- ExceptionInInitializerError error = new ExceptionInInitializerError(e.toString());
- error.initCause(e);
- throw error;
+ throw new ExceptionInInitializerError(e);
}
}
}
Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/plugins/io/XMLFilePlugin.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/plugins/io/XMLFilePlugin.java 2009-06-05 10:07:15 UTC (rev 26847)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/plugins/io/XMLFilePlugin.java 2009-06-05 12:13:14 UTC (rev 26848)
@@ -353,7 +353,7 @@
}
catch (Exception e)
{
- throw new ExceptionInInitializerError("Failed to create document builder:"+e);
+ throw new ExceptionInInitializerError(e);
}
}
}
More information about the jboss-svn-commits
mailing list