You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/07/03 04:39:49 UTC
svn commit: r790779 - in /geronimo/specs/trunk:
geronimo-jaxb_2.0_spec/src/main/java/javax/xml/bind/ContextFinder.java
geronimo-jaxb_2.1_spec/src/main/java/javax/xml/bind/ContextFinder.java
Author: xuhaihong
Date: Fri Jul 3 02:39:49 2009
New Revision: 790779
URL: http://svn.apache.org/viewvc?rev=790779&view=rev
Log:
GERONIMO-4724 Empty string for contextPath should not be allowed
Modified:
geronimo/specs/trunk/geronimo-jaxb_2.0_spec/src/main/java/javax/xml/bind/ContextFinder.java
geronimo/specs/trunk/geronimo-jaxb_2.1_spec/src/main/java/javax/xml/bind/ContextFinder.java
Modified: geronimo/specs/trunk/geronimo-jaxb_2.0_spec/src/main/java/javax/xml/bind/ContextFinder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.0_spec/src/main/java/javax/xml/bind/ContextFinder.java?rev=790779&r1=790778&r2=790779&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.0_spec/src/main/java/javax/xml/bind/ContextFinder.java (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.0_spec/src/main/java/javax/xml/bind/ContextFinder.java Fri Jul 3 02:39:49 2009
@@ -31,11 +31,12 @@
private static final String JAXB_CONTEXT_FACTORY = JAXBContext.JAXB_CONTEXT_FACTORY;
public static JAXBContext find(String contextPath, ClassLoader classLoader, Map properties) throws JAXBException {
- String className = null;
- String[] packages = contextPath.split(":");
- if (packages == null || packages.length == 0) {
+ contextPath = contextPath.trim();
+ if (contextPath.length() == 0 || contextPath.equals(":")) {
throw new JAXBException("Invalid contextPath");
}
+ String className = null;
+ String[] packages = contextPath.split("[:]");
for (String pkg : packages) {
String url = pkg.replace('.', '/') + "/jaxb.properties";
className = loadClassNameFromProperties(url, classLoader);
Modified: geronimo/specs/trunk/geronimo-jaxb_2.1_spec/src/main/java/javax/xml/bind/ContextFinder.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jaxb_2.1_spec/src/main/java/javax/xml/bind/ContextFinder.java?rev=790779&r1=790778&r2=790779&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jaxb_2.1_spec/src/main/java/javax/xml/bind/ContextFinder.java (original)
+++ geronimo/specs/trunk/geronimo-jaxb_2.1_spec/src/main/java/javax/xml/bind/ContextFinder.java Fri Jul 3 02:39:49 2009
@@ -31,11 +31,12 @@
private static final String JAXB_CONTEXT_FACTORY = JAXBContext.JAXB_CONTEXT_FACTORY;
public static JAXBContext find(String contextPath, ClassLoader classLoader, Map properties) throws JAXBException {
- String className = null;
- String[] packages = contextPath.split(":");
- if (packages == null || packages.length == 0) {
+ contextPath = contextPath.trim();
+ if (contextPath.length() == 0 || contextPath.equals(":")) {
throw new JAXBException("Invalid contextPath");
}
+ String className = null;
+ String[] packages = contextPath.split("[:]");
for (String pkg : packages) {
String url = pkg.replace('.', '/') + "/jaxb.properties";
className = loadClassNameFromProperties(url, classLoader);