Author: bpapez
Date: Tue Jan 1 22:18:07 2008
New Revision: 19435
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19435&repname=
=3Djahia
Log:
Refactor unnecessary if (cache.containsKey(key)) { return cache.get(key) }
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/applications/Jahi=
aApplicationsManagerBaseService.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/Contai=
nerFactory.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/files/JahiaTextFi=
leBaseService.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/pages/PagePropert=
yDB.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/sites/SiteLanguag=
eMappingPersistance.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
UserManagerLDAPProvider.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/application=
s/JahiaApplicationsManagerBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/applications/JahiaApplicationsManagerBaseS=
ervice.java&rev=3D19435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/applications/Jahi=
aApplicationsManagerBaseService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/applications/Jahi=
aApplicationsManagerBaseService.java Tue Jan 1 22:18:07 2008
@@ -155,10 +155,9 @@
checkIsLoaded ();
=
synchronized (registry) {
- ApplicationBean app;
- if (registry.containsKey(new Integer (appID))) {
- app =3D (ApplicationBean) registry.get(new
+ ApplicationBean app =3D (ApplicationBean) registry.get(new
Integer(appID));
+ if (app !=3D null) {
return app;
}
// try to load from db
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/=
ContainerFactory.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/containers/ContainerFactory.java&rev=3D194=
35&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/Contai=
nerFactory.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/Contai=
nerFactory.java Tue Jan 1 22:18:07 2008
@@ -833,36 +833,31 @@
if (jParams !=3D null) { // no jParams, can't check for rights
=
// Check container ACL access.
- Map acls =3D new Hashtable();
- if (ctnids.size () > 0) {
+ Map acls;
+ if (!ctnids.isEmpty()) {
=
JahiaACLManagerService.getInstance()
.preloadContainerACLsByPage(theContainerList.getPageID=
());
=
// JahiaACLManagerService.getInstance()
// .preloadFieldACLsByPage(theContainerList.getPageID());
- Integer listID =3D new Integer(theContainerList.getID()); =
=
- if ( (theContainerList.getID() > 0) &&
- !ContainerFactory.preloadedCtnrACLIDByCtnrListCache
- .containsKey(listID) ){
+ Integer listID =3D new Integer(theContainerList.getID());
+ acls =3D (Map) ContainerFactory.preloadedCtnrACLIDByCtnrLi=
stCache.get(listID);
+ if ( theContainerList.getID() > 0 && acls =3D=3D null) {
acls =3D c_utils.db_get_all_containers_aclid(theContai=
nerList.getID());
if ( acls !=3D null ){
ContainerFactory.preloadedCtnrACLIDByCtnrListCache.pu=
t(listID, acls);
}
- } else {
- acls =3D (Hashtable)ContainerFactory.preloadedCtnrACLI=
DByCtnrListCache
- .get(listID);
}
if ( acls =3D=3D null ){
acls =3D new Hashtable();
}
Vector v =3D new Vector ();
- int size =3D ctnids.size ();
Integer ctnID =3D null;
Integer aclID =3D null;
- for (int i =3D 0; i < size; i++) {
+ for (Iterator it =3D ctnids.iterator(); it.hasNext(); ) {
try {
- ctnID =3D (Integer) ctnids.get (i);
+ ctnID =3D (Integer) it.next();
aclID =3D (Integer) acls.get (ctnID);
if ( aclID =3D=3D null ){
aclID =3D new Integer(c_utils.getContainerACLI=
D(ctnID.intValue()));
@@ -888,8 +883,8 @@
JahiaContainer thisContainer =3D null;
List listOfContainer =3D new ArrayList(ctnids.size());
final JahiaContainersService jahiaContainersService =3D ServicesRe=
gistry.getInstance().getJahiaContainersService();
- for (int i =3D 0; i < ctnids.size(); i++) {
- int ctnid =3D ((Integer) ctnids.elementAt (i)).intValue ();
+ for (Iterator it =3D ctnids.iterator(); it.hasNext(); ) { =
=
+ int ctnid =3D ((Integer) it.next()).intValue ();
try {
thisContainer =3D jahiaContainersService.loadContainer( ct=
nid, loadFlag, jParams, loadVersion,
cachedFieldsInContainer,
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/files/Jahia=
TextFileBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/files/JahiaTextFileBaseService.java&rev=3D=
19435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/files/JahiaTextFi=
leBaseService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/files/JahiaTextFi=
leBaseService.java Tue Jan 1 22:18:07 2008
@@ -159,9 +159,7 @@
} else {
result =3D fieldValue;
}
- if (!cacheText.containsKey(fileName)){
- cacheText.put (fileName, result); =
- }
+ cacheText.put (fileName, result); =
}
logger.debug ("File : " + fullPath + ", value : " + result);
=
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/pages/PageP=
ropertyDB.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/pages/PagePropertyDB.java&rev=3D19435&repn=
ame=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/pages/PagePropert=
yDB.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/pages/PagePropert=
yDB.java Tue Jan 1 22:18:07 2008
@@ -362,9 +362,9 @@
int pageID =3D 0;
StringBuffer cacheEntryKey =3D new StringBuffer( pageKey );
cacheEntryKey.append( "_" ).append( siteID );
-
- if (pageIDForPageKeyCache.containsKey( cacheEntryKey.toString() ))=
{
- return ((Integer)pageIDForPageKeyCache.get( cacheEntryKey.toSt=
ring() )).intValue();
+ Integer pageIdObj =3D (Integer)pageIDForPageKeyCache.get( cacheEnt=
ryKey.toString() );
+ if (pageIdObj !=3D null) {
+ return pageIdObj.intValue();
}
=
try {
@@ -408,11 +408,12 @@
Connection dbConn =3D null;
PreparedStatement stmt =3D null;
ResultSet rs =3D null;
- ArrayList result =3D new ArrayList();
PageProperty curProperty =3D null;
-
- if (propertiesCacheByValue.containsKey(propertyValue)) {
- return (ArrayList) propertiesCacheByValue.get(propertyValue);
+ ArrayList result =3D (ArrayList) propertiesCacheByValue.get(proper=
tyValue);
+ if (result !=3D null) {
+ return result;
+ } else {
+ result =3D new ArrayList(); =
}
=
try {
@@ -466,10 +467,13 @@
Connection dbConn =3D null;
PreparedStatement stmt =3D null;
ResultSet rs =3D null;
- Map properties =3D new HashMap ();
+ Integer pageIdKey =3D new Integer(pageID);
+ Map properties =3D (Map) propertiesCacheByPageID.get(pageIdKey);
=
- if (propertiesCacheByPageID.containsKey(new Integer(pageID))) {
- return (Map) propertiesCacheByPageID.get(new Integer(pageID));
+ if (properties !=3D null) {
+ return properties;
+ } else {
+ properties =3D new HashMap ();
}
=
try {
@@ -500,9 +504,8 @@
if (curProperty !=3D null) {
properties.put(curProperty.getName(), curProperty);
}
- if (!propertiesCacheByPageID.containsKey(new Integer(pageID)))=
{
- propertiesCacheByPageID.put(new Integer(pageID), properties);
- }
+
+ propertiesCacheByPageID.put(pageIdKey, properties);
=
} catch (SQLException se) {
String errorMsg =3D "Error in PagePropertyDB.getPageProperties=
: " + se.getMessage ();
@@ -572,23 +575,7 @@
ResultSet rs =3D null;
Map properties =3D new HashMap ();
=
- // first let's mark all the entries that don't yet exist in the
- // cache as empty. We will fill them in the next step if they exist
- // in the database.
- int highestPageID =3D -1;
- Iterator pageIDIter =3D pageIDs.iterator();
- while (pageIDIter.hasNext()) {
- Integer curPageID =3D (Integer) pageIDIter.next();
- if (curPageID.intValue() > highestPageID) {
- highestPageID =3D curPageID.intValue();
- }
- if (!propertiesCacheByPageID.containsKey(curPageID)) {
- propertiesCacheByPageID.put(curPageID, new HashMap());
- }
- }
-
try {
-
dbConn =3D ConnectionDispenser.getConnection ();
stmt =3D dbConn.prepareStatement("SELECT * FROM jahia_pages_pr=
op ORDER BY page_id, prop_name");
rs =3D stmt.executeQuery ();
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/sites/SiteL=
anguageMappingPersistance.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/sites/SiteLanguageMappingPersistance.java&=
rev=3D19435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/sites/SiteLanguag=
eMappingPersistance.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/sites/SiteLanguag=
eMappingPersistance.java Tue Jan 1 22:18:07 2008
@@ -86,11 +86,13 @@
Connection dbConn =3D null;
Statement statement =3D null;
=
- Vector siteLanguageMappings =3D new Vector ();
+ Vector siteLanguageMappings =3D (Vector) siteLanguageMappingsCache=
.get(new Integer(siteID));
SiteLanguageMapping siteLanguageMapping =3D null;
=
- if (siteLanguageMappingsCache.containsKey(new Integer(siteID))) {
- return (Vector) siteLanguageMappingsCache.get(new Integer(site=
ID));
+ if (siteLanguageMappings !=3D null) {
+ return siteLanguageMappings;
+ } else {
+ siteLanguageMappings =3D new Vector();
}
=
try {
@@ -143,10 +145,10 @@
Connection dbConn =3D null;
Statement statement =3D null;
=
- SiteLanguageMapping siteLangMapping =3D null;
+ SiteLanguageMapping siteLangMapping =3D (SiteLanguageMapping) lang=
uageMappingCache.get(new Integer(id));
=
- if (languageMappingCache.containsKey(new Integer(id))) {
- return (SiteLanguageMapping) languageMappingCache.get(new Inte=
ger(id));
+ if (siteLangMapping !=3D null) {
+ return siteLangMapping;
}
=
try {
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager=
/JahiaUserManagerLDAPProvider.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.j=
ava&rev=3D19435&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
UserManagerLDAPProvider.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/usermanager/Jahia=
UserManagerLDAPProvider.java Tue Jan 1 22:18:07 2008
@@ -859,9 +859,9 @@
=
public JahiaLDAPUser lookupUserFromDN(String dn) {
logger.debug ("Lookup user from dn " + dn);
- JahiaLDAPUser user;
- if (mUserCache.containsKey("d"+dn)) {
- return (JahiaLDAPUser) mUserCache.get("d"+dn);
+ JahiaLDAPUser user =3D (JahiaLDAPUser) mUserCache.get("d"+dn);
+ if (user !=3D null) {
+ return user;
}
try {
Attributes attributes =3D getUser (getPublicContext(false), d=
n);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
