Commit 889969b0 authored by Matt Tucker's avatar Matt Tucker Committed by matt

Added synchronization to protect against concurrent mod exception.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5883 b35dd754-fafc-0310-a699-88a17e54d16e
parent 9f559c08
...@@ -115,7 +115,7 @@ public class AdminConsole { ...@@ -115,7 +115,7 @@ public class AdminConsole {
* *
* @return the name of the application. * @return the name of the application.
*/ */
public static String getAppName() { public static synchronized String getAppName() {
Element appName = (Element)generatedModel.selectSingleNode("//adminconsole/global/appname"); Element appName = (Element)generatedModel.selectSingleNode("//adminconsole/global/appname");
if (appName != null) { if (appName != null) {
String pluginName = appName.attributeValue("plugin"); String pluginName = appName.attributeValue("plugin");
...@@ -131,7 +131,7 @@ public class AdminConsole { ...@@ -131,7 +131,7 @@ public class AdminConsole {
* *
* @return the logo image. * @return the logo image.
*/ */
public static String getLogoImage() { public static synchronized String getLogoImage() {
Element globalLogoImage = (Element)generatedModel.selectSingleNode( Element globalLogoImage = (Element)generatedModel.selectSingleNode(
"//adminconsole/global/logo-image"); "//adminconsole/global/logo-image");
if (globalLogoImage != null) { if (globalLogoImage != null) {
...@@ -148,7 +148,7 @@ public class AdminConsole { ...@@ -148,7 +148,7 @@ public class AdminConsole {
* *
* @return the login image. * @return the login image.
*/ */
public static String getLoginLogoImage() { public static synchronized String getLoginLogoImage() {
Element globalLoginLogoImage = (Element)generatedModel.selectSingleNode( Element globalLoginLogoImage = (Element)generatedModel.selectSingleNode(
"//adminconsole/global/login-image"); "//adminconsole/global/login-image");
if (globalLoginLogoImage != null) { if (globalLoginLogoImage != null) {
...@@ -165,7 +165,7 @@ public class AdminConsole { ...@@ -165,7 +165,7 @@ public class AdminConsole {
* *
* @return the version string. * @return the version string.
*/ */
public static String getVersionString() { public static synchronized String getVersionString() {
Element globalVersion = (Element)generatedModel.selectSingleNode( Element globalVersion = (Element)generatedModel.selectSingleNode(
"//adminconsole/global/version"); "//adminconsole/global/version");
if (globalVersion != null) { if (globalVersion != null) {
...@@ -184,7 +184,7 @@ public class AdminConsole { ...@@ -184,7 +184,7 @@ public class AdminConsole {
* *
* @return the model. * @return the model.
*/ */
public static Element getModel() { public static synchronized Element getModel() {
return generatedModel; return generatedModel;
} }
...@@ -195,7 +195,7 @@ public class AdminConsole { ...@@ -195,7 +195,7 @@ public class AdminConsole {
* @param id the ID. * @param id the ID.
* @return the element. * @return the element.
*/ */
public static Element getElemnetByID(String id) { public static synchronized Element getElemnetByID(String id) {
return (Element)generatedModel.selectSingleNode("//*[@id='" + id + "']"); return (Element)generatedModel.selectSingleNode("//*[@id='" + id + "']");
} }
...@@ -282,7 +282,7 @@ public class AdminConsole { ...@@ -282,7 +282,7 @@ public class AdminConsole {
/** /**
* Rebuilds the generated model. * Rebuilds the generated model.
*/ */
private static void rebuildModel() { private static synchronized void rebuildModel() {
Document doc = DocumentFactory.getInstance().createDocument(); Document doc = DocumentFactory.getInstance().createDocument();
generatedModel = coreModel.createCopy(); generatedModel = coreModel.createCopy();
doc.add(generatedModel); doc.add(generatedModel);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment