You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/12/14 23:20:26 UTC
svn commit: r604315 - in /incubator/cxf/branches/2.0.x-fixes: ./
common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
Author: dkulp
Date: Fri Dec 14 14:20:25 2007
New Revision: 604315
URL: http://svn.apache.org/viewvc?rev=604315&view=rev
Log:
Merged revisions 604296 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r604296 | dkulp | 2007-12-14 16:13:27 -0500 (Fri, 14 Dec 2007) | 3 lines
[CXF-1290] Patch from Ian Roberts applied. Thanks!
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java?rev=604315&r1=604314&r2=604315&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/FileUtils.java Fri Dec 14 14:20:25 2007
@@ -44,7 +44,13 @@
if (defaultTempDir != null) {
return defaultTempDir;
}
- String s = System.getProperty(FileUtils.class.getName() + ".TempDirectory");
+
+ String s = null;
+ try {
+ s = System.getProperty(FileUtils.class.getName() + ".TempDirectory");
+ } catch (SecurityException e) {
+ //Ignorable, we'll use the default
+ }
if (s == null) {
int x = (int)(Math.random() * 1000000);
s = System.getProperty("java.io.tmpdir");