You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2007/03/24 00:16:30 UTC
svn commit: r521936 - in /webservices/axis2/trunk/java/modules:
addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
Author: gdaniels
Date: Fri Mar 23 16:16:29 2007
New Revision: 521936
URL: http://svn.apache.org/viewvc?view=rev&rev=521936
Log:
Clean up logic in DeploymentClassLoader
Remove unnecessary logger from AddressingInFaultHandler
Modified:
webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java?view=diff&rev=521936&r1=521935&r2=521936
==============================================================================
--- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java (original)
+++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java Fri Mar 23 16:16:29 2007
@@ -28,8 +28,6 @@
import org.apache.axis2.addressing.AddressingFaultsHelper;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.handlers.AbstractHandler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import javax.xml.namespace.QName;
@@ -38,8 +36,6 @@
* into understandable AxisFault objects.
*/
public class AddressingInFaultHandler extends AbstractHandler implements AddressingConstants {
-
- private static final Log log = LogFactory.getLog(AddressingInFaultHandler.class);
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
String action = msgContext.getWSAAction();
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java?view=diff&rev=521936&r1=521935&r2=521936
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java Fri Mar 23 16:16:29 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.deployment;
import org.apache.axiom.attachments.utils.IOUtils;
-import org.apache.axis2.classloader.JarFileUrlStreamHandler;
import org.apache.axis2.deployment.util.Utils;
import java.io.ByteArrayInputStream;
@@ -81,15 +80,9 @@
*/
protected Class findClass(String name) throws ClassNotFoundException {
Class clazz;
- boolean foundClass;
try {
clazz = super.findClass(name);
- foundClass = true;
- return clazz;
} catch (ClassNotFoundException e) {
- foundClass = false;
- }
- if (!foundClass) {
byte raw[];
try {
String completeFileName = name;
@@ -101,17 +94,13 @@
if (raw == null) {
throw new ClassNotFoundException("Class Not found : " + name);
}
- } catch (Exception e) {
- throw new RuntimeException(e);
+ } catch (Exception ex) {
+ // TODO: This, or throw new ClassNotFoundException?
+ throw new RuntimeException(ex);
}
clazz = defineClass(name, raw, 0, raw.length);
- foundClass = true;
- return clazz;
}
- if (!foundClass) {
- throw new ClassNotFoundException("Class Not found : " + name);
- }
- return null;
+ return clazz;
}
/**
@@ -127,10 +116,10 @@
for (int i = 0; embedded_jars != null && i < embedded_jars.size(); i++) {
String libjar_name = (String) embedded_jars.get(i);
try {
- InputStream in = getJarAsStream(libjar_name);
- ZipInputStream zin = new ZipInputStream(in);
- ZipEntry entry;
- String entryName = "";
+ InputStream in = getJarAsStream(libjar_name);
+ ZipInputStream zin = new ZipInputStream(in);
+ ZipEntry entry;
+ String entryName;
while ((entry = zin.getNextEntry()) != null) {
entryName = entry.getName();
if (entryName != null &&
@@ -168,7 +157,7 @@
InputStream in = getJarAsStream(libjar_name);
ZipInputStream zin = new ZipInputStream(in);
ZipEntry entry;
- String entryName = "";
+ String entryName;
while ((entry = zin.getNextEntry()) != null) {
entryName = entry.getName();
if (entryName != null &&
@@ -217,7 +206,7 @@
private byte[] getBytes(InputStream in, String resource) throws Exception {
ZipInputStream zin = new ZipInputStream(in);
ZipEntry entry;
- String entryName = "";
+ String entryName;
while ((entry = zin.getNextEntry()) != null) {
entryName = entry.getName();
if (entryName != null &&
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org