shuber 2004/08/13 19:37:53 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/applications
JahiaApplicationsManagerBaseService.java
Log:
Missing null check.
Revision Changes Path
1.11.4.2 +3 -1
jahia/src/java/org/jahia/services/applications/JahiaApplicationsManagerBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/applications/JahiaApplicationsManagerBaseService.java.diff?r1=1.11.4.1&r2=1.11.4.2&f=h
Index: JahiaApplicationsManagerBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/applications/Attic/JahiaApplicationsManagerBaseService.java,v
retrieving revision 1.11.4.1
retrieving revision 1.11.4.2
diff -u -r1.11.4.1 -r1.11.4.2
--- JahiaApplicationsManagerBaseService.java 13 Aug 2004 17:03:00 -0000
1.11.4.1
+++ JahiaApplicationsManagerBaseService.java 13 Aug 2004 17:37:53 -0000
1.11.4.2
@@ -165,7 +165,9 @@
app = ServicesRegistry.getInstance ()
.getJahiaApplicationsPersistanceService ()
.get_application_definition (appID);
- registry.put (new Integer (app.getID ()), app);
+ if (app != null) {
+ registry.put (new Integer (app.getID ()), app);
+ }
return app;
}
}