Author: solomax
Date: Tue Jun 17 14:57:41 2014
New Revision: 1603193
URL: http://svn.apache.org/r1603193
Log:
[OPENMEETINGS-1022] NPE and exclude-files are fixed
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/Admin.java?rev=1603193&r1=1603192&r2=1603193&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/Admin.java
(original)
+++
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/cli/Admin.java
Tue Jun 17 14:57:41 2014
@@ -293,7 +293,7 @@ public class Admin {
} else {
f = new File(file);
}
- boolean includeFiles =
Boolean.parseBoolean(cmdl.getOptionValue("exclude-files", "true"));
+ boolean includeFiles =
!cmdl.hasOption("exclude-files");
File backup_dir = new
File(OmFileHelper.getUploadTempDir(), "" + System.currentTimeMillis());
backup_dir.mkdirs();
@@ -437,7 +437,7 @@ public class Admin {
report.append("Recordings
allocates: ").append(OmFileHelper.getHumanSize(sectionSize)).append("\n");
long size =
OmFileHelper.getSize(hibernateDir);
long restSize = sectionSize -
size;
- FlvRecordingDao recordDao =
ctx.getBean(FlvRecordingDao.class);
+ FlvRecordingDao recordDao =
getApplicationContext(ctxName).getBean(FlvRecordingDao.class);
long[] params = {0, 0}; // [0]
== deleted [1] == missing
for (FlvRecording rec :
recordDao.getAllFlvRecordings()) {
checkRecordingFile(hibernateDir, rec.getFileHash(), rec.getDeleted(), params,
cleanup);
@@ -593,8 +593,10 @@ public class Admin {
}
private void immediateDropDB(ConnectionProperties props) throws
Exception {
- ctx.destroy();
- ctx = null;
+ if (ctx != null) {
+ ctx.destroy();
+ ctx = null;
+ }
JDBCConfigurationImpl conf = new JDBCConfigurationImpl();
try {
conf.setPropertiesFile(new File(OmFileHelper.getWebinfDir(),
PERSISTENCE_NAME));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1603193&r1=1603192&r2=1603193&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
Tue Jun 17 14:57:41 2014
@@ -293,7 +293,7 @@ public class Admin {
} else {
f = new File(file);
}
- boolean includeFiles =
Boolean.parseBoolean(cmdl.getOptionValue("exclude-files", "true"));
+ boolean includeFiles =
!cmdl.hasOption("exclude-files");
File backup_dir = new
File(OmFileHelper.getUploadTempDir(), "" + System.currentTimeMillis());
backup_dir.mkdirs();
@@ -437,7 +437,7 @@ public class Admin {
report.append("Recordings
allocates: ").append(OmFileHelper.getHumanSize(sectionSize)).append("\n");
long size =
OmFileHelper.getSize(hibernateDir);
long restSize = sectionSize -
size;
- FlvRecordingDao recordDao =
ctx.getBean(FlvRecordingDao.class);
+ FlvRecordingDao recordDao =
getApplicationContext(ctxName).getBean(FlvRecordingDao.class);
long[] params = {0, 0}; // [0]
== deleted [1] == missing
for (FlvRecording rec :
recordDao.getAllFlvRecordings()) {
checkRecordingFile(hibernateDir, rec.getFileHash(), rec.getDeleted(), params,
cleanup);
@@ -593,8 +593,10 @@ public class Admin {
}
private void immediateDropDB(ConnectionProperties props) throws
Exception {
- ctx.destroy();
- ctx = null;
+ if (ctx != null) {
+ ctx.destroy();
+ ctx = null;
+ }
JDBCConfigurationImpl conf = new JDBCConfigurationImpl();
try {
conf.setPropertiesFile(new File(OmFileHelper.getWebinfDir(),
PERSISTENCE_NAME));
