Author: simonetripodi
Date: Sat Apr 9 22:48:40 2011
New Revision: 1090700
URL: http://svn.apache.org/viewvc?rev=1090700&view=rev
Log:
DISCOVERY-13: Problem with Oracle JVM classLoader
Modified:
commons/proper/discovery/trunk/RELEASE-NOTES.txt
commons/proper/discovery/trunk/src/changes/changes.xml
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
Modified: commons/proper/discovery/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/RELEASE-NOTES.txt?rev=1090700&r1=1090699&r2=1090700&view=diff
==============================================================================
--- commons/proper/discovery/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/discovery/trunk/RELEASE-NOTES.txt Sat Apr 9 22:48:40 2011
@@ -40,6 +40,7 @@ JIRA Issues Addressed
* DISCOVERY-9 (https://issues.apache.org/jira/browse/DISCOVERY-9)
* DISCOVERY-11 (https://issues.apache.org/jira/browse/DISCOVERY-11)
* DISCOVERY-12 (https://issues.apache.org/jira/browse/DISCOVERY-12)
+* DISCOVERY-13 (https://issues.apache.org/jira/broese/DISCOVERY-13)
* DISCOVERY-14 (https://issues.apache.org/jira/browse/DISCOVERY-14)
* DISCOVERY-15 (https://issues.apache.org/jira/browse/DISCOVERY-15)
* DISCOVERY-16 (https://issues.apache.org/jira/browse/DISCOVERY-16)
Modified: commons/proper/discovery/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/changes/changes.xml?rev=1090700&r1=1090699&r2=1090700&view=diff
==============================================================================
--- commons/proper/discovery/trunk/src/changes/changes.xml (original)
+++ commons/proper/discovery/trunk/src/changes/changes.xml Sat Apr 9 22:48:40
2011
@@ -43,6 +43,9 @@
SPI implementation class searching logic has some issues: it discards
all errors;
it only considers first className in supplied classNames array.
</action>
+ <action dev="simonetripodi" type="fix" issue="DISCOVERY-13">
+ Problem with Oracle JVM classLoader.
+ </action>
<action dev="simonetripodi" type="update" issue="DISCOVERY-14">
Moved to Java5 APIs, used Generics.
</action>
Modified:
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
URL:
http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java?rev=1090700&r1=1090699&r2=1090700&view=diff
==============================================================================
---
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
(original)
+++
commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/resource/classes/DiscoverClasses.java
Sat Apr 9 22:48:40 2011
@@ -99,9 +99,15 @@ public class DiscoverClasses<T> extends
ClassLoader loader = getClassLoaders().get(idx++);
URL url = null;
+ boolean getResourceUnsupported = false;
+
try {
url = loader.getResource(resourceName);
} catch (UnsupportedOperationException e) {
+ getResourceUnsupported = true;
+ }
+
+ if (url == null || getResourceUnsupported) {
try {
CodeSource codeSource = loader.loadClass(className)
.getProtectionDomain()