litesoft

Explore

Commits

Diff Revisions 71 vs 72 for /trunk/Java/core/Server/src/org/litesoft/util/DirectoryUtils.java

		@@ -110,25 +110,34 @@
110	110		}
111	111		}
112	112
113		-	public static void moveFile( File zSourceFile, File zTargetFile )
	113	+	public static void moveFile( File pSourceFile, File pTargetFile )
114	114		throws FileSystemException
115	115		{
116		-	Utils.assertNotNull( "SourceFile", zSourceFile );
117		-	Utils.assertNotNull( "TargetFile", zTargetFile );
	116	+	Utils.assertNotNull( "SourceFile", pSourceFile );
	117	+	Utils.assertNotNull( "TargetFile", pTargetFile );
118	118		try
119	119		{
120		-	if ( zSourceFile.renameTo( zTargetFile ) )
	120	+	if ( pSourceFile.exists() )
121	121		{
122		-	if ( zTargetFile.exists() )
	122	+	File zParent = pTargetFile.getParentFile();
	123	+	if ( zParent != null )
	124	+	{
	125	+	//noinspection ResultOfMethodCallIgnored
	126	+	zParent.mkdirs();
	127	+	}
	128	+	}
	129	+	if ( pSourceFile.renameTo( pTargetFile ) )
	130	+	{
	131	+	if ( pTargetFile.exists() )
123	132		{
124	133		return;
125	134		}
126	135		}
127		-	throw new FileSystemException( "Failed to Move (rename): " + zSourceFile + " to " + zTargetFile );
	136	+	throw new FileSystemException( "Failed to Move (rename): " + pSourceFile + " to " + pTargetFile );
128	137		}
129	138		catch ( RuntimeException e )
130	139		{
131		-	throw new FileSystemException( "Failed to Move (rename): " + zSourceFile + " to " + zTargetFile, e );
	140	+	throw new FileSystemException( "Failed to Move (rename): " + pSourceFile + " to " + pTargetFile, e );
132	141		}
133	142		}
134	143