Author: sergiykarpenko Date: 2011-05-27 07:03:32 -0400 (Fri, 27 May 2011) New Revision: 4437 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewStreamExporter.java jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java Log: EXOJCR-1167: SystemViewStreamExporter stream close added. BackupChainLog PrivilegedFileHelper.getCanonicalPath() used. Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewStreamExporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewStreamExporter.java 2011-05-27 10:39:22 UTC (rev 4436) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewStreamExporter.java 2011-05-27 11:03:32 UTC (rev 4437) @@ -237,13 +237,23 @@ else { InputStream is = data.getAsStream(); - byte[] buffer = new byte[BUFFER_SIZE]; - int len; - while ((len = is.read(buffer)) > 0) + try { - char[] charbuf1 = Base64.encode(buffer, 0, len, 0, "").toCharArray(); - writer.writeCharacters(charbuf1, 0, charbuf1.length); + byte[] buffer = new byte[BUFFER_SIZE]; + int len; + while ((len = is.read(buffer)) > 0) + { + char[] charbuf1 = Base64.encode(buffer, 0, len, 0, "").toCharArray(); + writer.writeCharacters(charbuf1, 0, charbuf1.length); + } } + finally + { + if (is != null) + { + is.close(); + } + } } } } Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java =================================================================== --- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java 2011-05-27 10:39:22 UTC (rev 4436) +++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/backup/BackupChainLog.java 2011-05-27 11:03:32 UTC (rev 4437) @@ -736,8 +736,7 @@ String dir = readContent(); if (dir.equals(".")) { - String path = logFile.getParentFile().getCanonicalPath(); - + String path = PrivilegedFileHelper.getCanonicalPath(logFile.getParentFile()); conf.setBackupDir(new File(path)); } else