tomj 2002/09/17 12:51:07
Modified: java/src/org/apache/axis/encoding/ser ArrayDeserializer.java
java/src/org/apache/axis/configuration
EngineConfigurationFactoryFinder.java
java/src/org/apache/axis/attachments
ManagedMemoryDataSource.java
Log:
Fix up a few exceptions which jikes complains about
i.e. we are catching Exception where nothing is declared thrown.
Revision Changes Path
1.28 +3 -1
xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java
Index: ArrayDeserializer.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/encoding/ser/ArrayDeserializer.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ArrayDeserializer.java 9 Sep 2002 17:03:23 -0000 1.27
+++ ArrayDeserializer.java 17 Sep 2002 19:51:07 -0000 1.28
@@ -537,7 +537,9 @@
if (arrayClass != null) {
value = JavaUtils.convert(value, arrayClass);
}
- } catch (Exception e) {}
+ } catch (RuntimeException e) {
+ // We must ignore exceptions from convert for Arrays with null - why?
+ }
}
super.valueComplete();
}
1.10 +2 -2
xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryFinder.java
Index: EngineConfigurationFactoryFinder.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryFinder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EngineConfigurationFactoryFinder.java 12 Sep 2002 23:39:37 -0000 1.9
+++ EngineConfigurationFactoryFinder.java 17 Sep 2002 19:51:07 -0000 1.10
@@ -162,7 +162,7 @@
if (factory == null) {
try {
factory =
EngineConfigurationFactoryServlet.newFactory(obj);
- } catch (Exception e) {
+ } catch (RuntimeException e) {
log.warn(Messages.getMessage("engineConfigInvokeNewFactory",
EngineConfigurationFactoryServlet.class.getName(),
requiredMethod), e);
@@ -172,7 +172,7 @@
try {
// should NEVER return null.
factory =
EngineConfigurationFactoryDefault.newFactory(obj);
- } catch (Exception e) {
+ } catch (RuntimeException e) {
log.warn(Messages.getMessage("engineConfigInvokeNewFactory",
EngineConfigurationFactoryDefault.class.getName(),
requiredMethod),
e);
1.21 +0 -6
xml-axis/java/src/org/apache/axis/attachments/ManagedMemoryDataSource.java
Index: ManagedMemoryDataSource.java
===================================================================
RCS file:
/home/cvs/xml-axis/java/src/org/apache/axis/attachments/ManagedMemoryDataSource.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ManagedMemoryDataSource.java 9 Sep 2002 17:03:25 -0000 1.20
+++ ManagedMemoryDataSource.java 17 Sep 2002 19:51:07 -0000 1.21
@@ -510,12 +510,6 @@
// Give it our best shot.
diskCacheFile.deleteOnExit();
-
- try {
- } catch (Exception e2) {
-
- // Gave it our best shot.
- }
}
}
