You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by kr...@apache.org on 2011/03/09 21:45:41 UTC
svn commit: r1079987 -
/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
Author: krosenvold
Date: Wed Mar 9 20:45:41 2011
New Revision: 1079987
URL: http://svn.apache.org/viewvc?rev=1079987&view=rev
Log:
Revert "o Added error handler to tempfile creation to see what's up in jenkins"
Turned out someone had turned off failing the build on test failures, which had
me a little jumpy for a few moments. Release RSN.
Modified:
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java?rev=1079987&r1=1079986&r2=1079987&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java Wed Mar 9 20:45:41 2011
@@ -19,8 +19,6 @@ package org.apache.maven.surefire.booter
* under the License.
*/
-import org.apache.maven.surefire.util.NestedRuntimeException;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -72,26 +70,19 @@ public class SystemPropertyManager
p.setAsSystemProperties();
}
- public static File writePropertiesFile( Properties properties, File tempDirectory, String name, boolean isDebug )
+ public static File writePropertiesFile( Properties properties, File tempDirectory, String name,
+ boolean isDebug )
throws IOException
{
- try
+ File file = File.createTempFile( name, "tmp", tempDirectory );
+ if ( !isDebug )
{
- File file = File.createTempFile( name, "tmp", tempDirectory );
- if ( !isDebug )
- {
- file.deleteOnExit();
- }
+ file.deleteOnExit();
+ }
- writePropertiesFile( file, name, properties );
+ writePropertiesFile( file, name, properties );
- return file;
- }
- catch ( IOException e )
- {
- throw new NestedRuntimeException(
- "Unable to create temp file in " + tempDirectory + ", exists=" + tempDirectory.exists(), e );
- }
+ return file;
}
public static void writePropertiesFile( File file, String name, Properties properties )