shuber 2005/04/05 15:48:46 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/data/applications ApplicationBean.java
src/java/org/jahia/engines/shared Application_Field.java
Log:
Fix problem with shared application names, that were being concatenated every
time we accessed the ApplicationField engine.
Revision Changes Path
1.3.4.1.2.1 +17 -10
jahia/src/java/org/jahia/data/applications/ApplicationBean.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/data/applications/ApplicationBean.java.diff?r1=1.3.4.1&r2=1.3.4.1.2.1&f=h
1.15.4.4.2.1 +3 -0
jahia/src/java/org/jahia/engines/shared/Application_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/engines/shared/Application_Field.java.diff?r1=1.15.4.4&r2=1.15.4.4.2.1&f=h
Index: ApplicationBean.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/data/applications/Attic/ApplicationBean.java,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.1.2.1
diff -u -r1.3.4.1 -r1.3.4.1.2.1
--- ApplicationBean.java 13 Aug 2004 17:02:59 -0000 1.3.4.1
+++ ApplicationBean.java 5 Apr 2005 13:48:45 -0000 1.3.4.1.2.1
@@ -10,17 +10,17 @@
* @author Serge Huber
* @version 1.0
*/
-public class ApplicationBean implements Serializable, Comparator {
+public class ApplicationBean implements Serializable, Comparator, Cloneable {
private int ID;
private int jahiaID;
private String name;
private String context;
private int visible = 0;
- private boolean shared = false;
+ private boolean shared = false;
private int rights;
- private String filename = ""; // the file name of the .war or .ear
package
- private String desc = "";
+ private String filename = ""; // the file name of the .war or .ear
package
+ private String desc = "";
/**
*
@@ -76,16 +76,23 @@
//-------------------------------------------------------------------------
/**
* Compare between two objects, sort by their name
- *
+ *
* @param Object
* @param Object
*/
- public int compare(Object c1, Object c2) throws ClassCastException {
-
- return ((ApplicationBean)c1)
-
.getName().compareToIgnoreCase(((ApplicationBean)c2).getName());
+ public int compare(Object c1, Object c2) throws ClassCastException {
- }
+ return ((ApplicationBean)c1)
+
.getName().compareToIgnoreCase(((ApplicationBean)c2).getName());
+ }
+ public Object clone() {
+ try {
+ return super.clone();
+ } catch (CloneNotSupportedException cnse) {
+ // should never happen as we do support Cloneable in the
interface
+ return null;
+ }
+ }
} // end ApplicationBean
Index: Application_Field.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/engines/shared/Attic/Application_Field.java,v
retrieving revision 1.15.4.4
retrieving revision 1.15.4.4.2.1
diff -u -r1.15.4.4 -r1.15.4.4.2.1
--- Application_Field.java 24 Nov 2004 10:47:57 -0000 1.15.4.4
+++ Application_Field.java 5 Apr 2005 13:48:45 -0000 1.15.4.4.2.1
@@ -303,6 +303,9 @@
JahiaSite ownerSite = ServicesRegistry.getInstance().
getJahiaSitesService().getSite(app.getJahiaID());
if ( ownerSite != null ){
+ // we clone because we will change the name on the
copy
+ // and don't want to corrupt the cached entry.
+ app = (ApplicationBean) app.clone();
app.setName(app.getName()+"-["+ownerSite.getServerName()+"]");
}
}
