[Firebird-checkins] CVS: client-java/src/main/org/firebirdsql/management FBBackupManager.java, 1.11, 1.12

[Roman R. <rro...@us...>]

Update of /cvsroot/firebird/client-java/src/main/org/firebirdsql/management
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30606/src/main/org/firebirdsql/management

Modified Files:
	FBBackupManager.java 
Log Message:
merged with Branch_2_1

Index: FBBackupManager.java
===================================================================
RCS file: /cvsroot/firebird/client-java/src/main/org/firebirdsql/management/FBBackupManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -U3 -r1.11 -r1.12
--- FBBackupManager.java	20 Jan 2006 04:09:34 -0000	1.11
+++ FBBackupManager.java	29 Jun 2008 20:05:47 -0000	1.12
@@ -1,6 +1,4 @@
 /*
- * $Id$
- * 
  * Firebird Open Source J2EE Connector - JDBC Driver
  *
  * Distributable under LGPL license.
@@ -347,14 +345,14 @@
         for (Iterator iter = backupPaths.iterator(); iter.hasNext();) {
             PathSizeStruct pathSize = (PathSizeStruct) iter.next();
             
-            restoreSPB.addArgument(ISCConstants.isc_spb_dbname, pathSize.getPath());            
+            restoreSPB.addArgument(ISCConstants.isc_spb_bkp_file, pathSize.getPath());            
         }
         
         // restore files with sizes except the last one
         for (Iterator iter = restorePaths.iterator(); iter.hasNext();) {
             PathSizeStruct pathSize = (PathSizeStruct) iter.next();
             
-            restoreSPB.addArgument(ISCConstants.isc_spb_bkp_file, pathSize.getPath());
+            restoreSPB.addArgument(ISCConstants.isc_spb_dbname, pathSize.getPath());
             
             if (iter.hasNext() && pathSize.getSize() != -1)
                 restoreSPB.addArgument(ISCConstants.isc_spb_res_length, pathSize.getSize());