Author: rmannibucau
Date: Sun Jun 24 16:32:15 2012
New Revision: 1353292
URL: http://svn.apache.org/viewvc?rev=1353292&view=rev
Log:
handling null basurl or catalog url (was not an issue, just the log was weird)
Modified:
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java
Modified:
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java?rev=1353292&r1=1353291&r2=1353292&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java
(original)
+++
openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/CxfCatalogUtils.java
Sun Jun 24 16:32:15 2012
@@ -32,12 +32,21 @@ public final class CxfCatalogUtils {
private static final Logger logger = Logger.getInstance(LogCategory.CXF,
CxfCatalogUtils.class);
public static void loadOASISCatalog(Bus bus, URL baseURL, String
catalogName) {
+ if (baseURL == null) {
+ logger.debug("baseUrl is not valid for catalog '" + catalogName +
"'");
+ return;
+ }
+
URL catalogURL = null;
try {
catalogURL = new URL(baseURL, catalogName);
- logger.debug("Checking for " + catalogURL + " catalog.");
- catalogURL.openStream().close();
- loadOASISCatalog(bus, catalogURL);
+ if (catalogURL != null) { // some catalog are no more provided by
cxf
+ logger.debug("Checking for " + catalogURL + " catalog.");
+ catalogURL.openStream().close();
+ loadOASISCatalog(bus, catalogURL);
+ } else {
+ logger.info("catalog '" + catalogName + "' not found");
+ }
} catch (MalformedURLException e) {
logger.warning("Error constructing catalog URL: " + baseURL + " "
+ catalogName);
} catch (FileNotFoundException e) {
