Author: solomax
Date: Sun Apr 2 14:01:33 2017
New Revision: 1789884
URL: http://svn.apache.org/viewvc?rev=1789884&view=rev
Log:
no jira: small issues in dashboard serialization are fixed
Modified:
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1789884&r1=1789883&r2=1789884&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Sun Apr 2 14:01:33 2017
@@ -94,7 +94,7 @@ public class OmFileHelper {
private static File getDir(File parent, String name) {
File f = new File(parent, name);
if (!f.exists()) {
- f.mkdir();
+ f.mkdirs();
}
return f;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1789884&r1=1789883&r2=1789884&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
Sun Apr 2 14:01:33 2017
@@ -27,6 +27,8 @@ import static org.red5.logging.Red5Logge
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Collections;
import org.slf4j.Logger;
@@ -39,7 +41,7 @@ import com.thoughtworks.xstream.io.xml.D
public class UserDashboardPersister implements DashboardPersister {
private static final Logger log =
getLogger(UserDashboardPersister.class, webAppRootKey);
-
+
@Override
public Dashboard load() {
return new XStreamDashboardPersister().load();
@@ -53,23 +55,23 @@ public class UserDashboardPersister impl
public static class XStreamDashboardPersister implements
DashboardPersister {
private File file;
private XStream xstream;
-
+
public XStreamDashboardPersister() {
this.file = getUserDashboard(getUserId());
-
+
xstream = new XStream(new DomDriver(UTF_8.name()));
xstream.setMode(XStream.NO_REFERENCES);
xstream.alias("dashboard", UserDashboard.class);
}
-
+
@Override
public Dashboard load() {
if (!file.exists() || !file.isFile()) {
return null;
}
-
- try {
- return (Dashboard) xstream.fromXML(new
FileInputStream(file));
+
+ try (InputStream is = new FileInputStream(file)) {
+ return (Dashboard) xstream.fromXML(is);
} catch (Exception e) {
log.error("Error while loading dashboard", e);
return null;
@@ -80,9 +82,9 @@ public class UserDashboardPersister impl
public void save(Dashboard dashboard) {
// sort widgets
Collections.sort(dashboard.getWidgets(), new
WidgetComparator());
-
- try {
- xstream.toXML(dashboard, new
FileOutputStream(file));
+
+ try (OutputStream os = new FileOutputStream(file)) {
+ xstream.toXML(dashboard, os);
} catch (Exception e) {
log.error("Error while saving dashboard", e);
}
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1789884&r1=1789883&r2=1789884&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Sun Apr 2 14:01:33 2017
@@ -95,7 +95,7 @@ public class OmFileHelper {
private static File getDir(File parent, String name) {
File f = new File(parent, name);
if (!f.exists()) {
- f.mkdir();
+ f.mkdirs();
}
return f;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1789884&r1=1789883&r2=1789884&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
Sun Apr 2 14:01:33 2017
@@ -27,6 +27,8 @@ import static org.red5.logging.Red5Logge
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Collections;
import org.slf4j.Logger;
@@ -39,7 +41,7 @@ import com.thoughtworks.xstream.io.xml.D
public class UserDashboardPersister implements DashboardPersister {
private static final Logger log =
getLogger(UserDashboardPersister.class, webAppRootKey);
-
+
@Override
public Dashboard load() {
return new XStreamDashboardPersister().load();
@@ -53,23 +55,23 @@ public class UserDashboardPersister impl
public static class XStreamDashboardPersister implements
DashboardPersister {
private File file;
private XStream xstream;
-
+
public XStreamDashboardPersister() {
this.file = getUserDashboard(getUserId());
-
+
xstream = new XStream(new DomDriver(UTF_8.name()));
xstream.setMode(XStream.NO_REFERENCES);
xstream.alias("dashboard", UserDashboard.class);
}
-
+
@Override
public Dashboard load() {
if (!file.exists() || !file.isFile()) {
return null;
}
-
- try {
- return (Dashboard) xstream.fromXML(new
FileInputStream(file));
+
+ try (InputStream is = new FileInputStream(file)) {
+ return (Dashboard) xstream.fromXML(is);
} catch (Exception e) {
log.error("Error while loading dashboard", e);
return null;
@@ -80,9 +82,9 @@ public class UserDashboardPersister impl
public void save(Dashboard dashboard) {
// sort widgets
Collections.sort(dashboard.getWidgets(), new
WidgetComparator());
-
- try {
- xstream.toXML(dashboard, new
FileOutputStream(file));
+
+ try (OutputStream os = new FileOutputStream(file)) {
+ xstream.toXML(dashboard, os);
} catch (Exception e) {
log.error("Error while saving dashboard", e);
}
