[jbossws-commits] JBossWS SVN: r17095 - in common/trunk/src/main/java/org/jboss/ws/common: configuration and 1 other directories.
Author: richard.opalka(a)jboss.com
Date: 2012-12-17 09:50:43 -0500 (Mon, 17 Dec 2012)
New Revision: 17095
Modified:
common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
Log:
[JBWS-3573] fixing some violations
Modified: common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2012-12-17 13:21:38 UTC
(rev 17094)
+++ common/trunk/src/main/java/org/jboss/ws/common/IOUtils.java 2012-12-17 14:50:43 UTC
(rev 17095)
@@ -128,7 +128,9 @@
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
ServerConfig config =
spiProvider.getSPI(ServerConfigFactory.class).getServerConfig();
tmpdir = new File(config.getServerTempDir().getCanonicalPath() +
"/jbossws");
- tmpdir.mkdirs();
+ if (!tmpdir.mkdirs()) {
+ tmpdir = null;
+ }
}
catch (Throwable t)
{
Modified: common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-12-17
13:21:38 UTC (rev 17094)
+++
common/trunk/src/main/java/org/jboss/ws/common/configuration/ConfigHelper.java 2012-12-17
14:50:43 UTC (rev 17095)
@@ -92,7 +92,7 @@
is =
SecurityActions.getContextClassLoader().getResourceAsStream(configFile);
if (is != null) {
ConfigRoot config = ConfigMetaDataParser.parse(is);
- ClientConfig cc = config.getClientConfigByName(configName);
+ ClientConfig cc = config != null ?
config.getClientConfigByName(configName) : null;
if (cc != null) {
return cc;
}
Modified:
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java
===================================================================
---
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2012-12-17
13:21:38 UTC (rev 17094)
+++
common/trunk/src/main/java/org/jboss/ws/common/utils/AbstractWSDLFilePublisher.java 2012-12-17
14:50:43 UTC (rev 17095)
@@ -153,7 +153,11 @@
URL targetURL = new URL(baseURI.substring(0,
baseURI.lastIndexOf("/") + 1) + locationURI);
File targetFile = new File(targetURL.getFile()); //JBWS-3488
- targetFile.getParentFile().mkdirs();
+ if (targetFile.getParentFile() != null) {
+ if (!targetFile.getParentFile().mkdirs()) {
+ ; // exception will be thrown later in this code
+ }
+ }
WSDLFactory wsdlFactory = WSDLFactory.newInstance();
javax.wsdl.xml.WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
@@ -208,7 +212,11 @@
URL xsdURL = new URL(baseURI.substring(0,
baseURI.lastIndexOf("/") + 1) + schemaLocation);
File targetFile = new File(xsdURL.getFile()); //JBWS-3488
- targetFile.getParentFile().mkdirs();
+ if (targetFile.getParentFile() != null) {
+ if (!targetFile.getParentFile().mkdirs()) {
+ ; // exception will be thrown later in this code
+ }
+ }
String deploymentName = dep.getCanonicalName();
@@ -287,6 +295,8 @@
}
// delete the directory as well
- dir.delete();
+ if (!dir.delete()) {
+ dir.deleteOnExit();
+ }
}
}