Author: tdraier
Date: Fri Jun 29 15:19:15 2007
New Revision: 17838
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17838&repname=
=3Djahia
Log:
clean up, log exception
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainer.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainerList.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Co=
ntentField.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/contain=
ers/JahiaContainer.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/containers/JahiaContainer.java&rev=3D1=
7838&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-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainer.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainer.java Fri Jun 29 15:19:15 2007
@@ -808,19 +808,11 @@
if (containerACL !=3D null) {
// Test the access rights
result =3D containerACL.getPermission(user, permission);
-
- // destroy the object.
- containerACL =3D null;
}
} catch (JahiaException ex) {
- //JahiaConsole.println ("JahiaContainer", "JahiaException caug=
ht in checkAccess.");
+ logger.debug("Problem getting ACL on container.", ex);
}
=
- //if (!result) {
- // JahiaConsole.println ("JahiaContainer", "Permission denied f=
or user ["+
- // user.getName()+"] to container ["+Integer.toString(I=
D)+
- // "] for access permission ["+Integer.toString(permiss=
ion)+"]");
- //}
return result;
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/contain=
ers/JahiaContainerList.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/containers/JahiaContainerList.java&rev=
=3D17838&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-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainerList.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Ja=
hiaContainerList.java Fri Jun 29 15:19:15 2007
@@ -404,32 +404,18 @@
if ( aclID =3D=3D 0 )
return true;
=
-
- //JahiaConsole.println ("->> containerList checkAccess : container=
List ["+Integer.toString (ID)+
- // "], permission ["+Integer.toString (permission)+"], user ["+=
user.getName()+"]");
-
boolean result =3D false;
- try
- {
+ try {
// Try to instanciate the ACL.
JahiaBaseACL containerListACL =3D getACL();
if (containerListACL !=3D null) {
// Test the access rights
result =3D containerListACL.getPermission (user, permissio=
n);
-
- // destroy the object.
- containerListACL =3D null;
}
- }
- catch (JahiaException ex) {
+ } catch (JahiaException ex) {
logger.debug("Problem getting ACL on container list.", ex);
}
=
- //if (!result) {
- // JahiaConsole.println ("JahiaContainerList", "Permission deni=
ed for user ["+
- // user.getName()+"] to containerList ["+Integer.toStri=
ng(ID)+
- // "] for access permission ["+Integer.toString(permiss=
ion)+"]");
- //}
return result;
}
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fie=
lds/ContentField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/fields/ContentField.java&rev=3D178=
38&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-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Co=
ntentField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Co=
ntentField.java Fri Jun 29 15:19:15 2007
@@ -2032,7 +2032,7 @@
return buff.toString();
}
=
- public boolean checkAccess(JahiaUser user, int permission) {
+ public boolean checkAccess(JahiaUser user, int permission, boolean che=
ckChilds) {
if (containerID > 0) {
// We must get the acl associated with the container list
try {
@@ -2053,6 +2053,7 @@
}
}
} catch (JahiaException e) {
+ logger.error("Cannot check acl on field"+ this.getID(), e);
}
}
return super.checkAccess(user, permission,false);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
