svn commit: r1764940 - in /openmeetings/application: branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/ branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/ trunk/openmeetings-core/src/ma...

[solomax]

Author: solomax
Date: Fri Oct 14 16:06:51 2016
New Revision: 1764940

URL: http://svn.apache.org/viewvc?rev=1764940&view=rev
Log:
[OPENMEETINGS-1457] build should be fixed

Modified:
    
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
    
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
    
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
    
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1764940&r1=1764939&r2=1764940&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
 Fri Oct 14 16:06:51 2016
@@ -108,7 +108,6 @@ public class FileProcessor {
                        return returnError;
                }
                FileUtils.copyInputStreamToFile(is, file);
-               is.close();
 
                
                log.debug("canBeConverted: " + canBeConverted);

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1764940&r1=1764939&r2=1764940&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
 Fri Oct 14 16:06:51 2016
@@ -49,6 +49,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -224,7 +225,7 @@ public class BackupImport {
                                        }
                                }
                                if (!fentry.isDirectory()) {
-                                       FileUtils.copyInputStreamToFile(zis, 
fentry);
+                                       Files.copy(zis, fentry.toPath());
                                        zis.closeEntry();
                                }
                        }

Modified: 
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java?rev=1764940&r1=1764939&r2=1764940&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
 Fri Oct 14 16:06:51 2016
@@ -108,7 +108,6 @@ public class FileProcessor {
                        return returnError;
                }
                FileUtils.copyInputStreamToFile(is, file);
-               is.close();
 
                
                log.debug("canBeConverted: " + canBeConverted);

Modified: 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1764940&r1=1764939&r2=1764940&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
 Fri Oct 14 16:06:51 2016
@@ -49,6 +49,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -224,7 +225,7 @@ public class BackupImport {
                                        }
                                }
                                if (!fentry.isDirectory()) {
-                                       FileUtils.copyInputStreamToFile(zis, 
fentry);
+                                       Files.copy(zis, fentry.toPath());
                                        zis.closeEntry();
                                }
                        }