Author: dkulp
Date: Thu Apr 4 17:03:24 2013
New Revision: 1464638
URL: http://svn.apache.org/r1464638
Log:
Merged revisions 1464185 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1464185 | dkulp | 2013-04-03 15:59:08 -0400 (Wed, 03 Apr 2013) | 2 lines
Fix compile failure
........
Modified:
cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
Modified:
cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java?rev=1464638&r1=1464637&r2=1464638&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
(original)
+++
cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBContextCache.java
Thu Apr 4 17:03:24 2013
@@ -229,9 +229,6 @@ public final class JAXBContextCache {
throw ex;
}
}
- if (context == null) {
- throw ex;
- }
}
cachedContextAndSchemas = new CachedContextAndSchemasInternal(context,
classes);
synchronized (JAXBCONTEXT_CACHE) {
