You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by un...@apache.org on 2004/09/01 12:28:53 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/macro MacroPropertyUpdater.java
unico 2004/09/01 03:28:53
Modified: src/share/org/apache/slide/macro MacroPropertyUpdater.java
Log:
correctly handle the unauthenticated owner
Revision Changes Path
1.6 +10 -3 jakarta-slide/src/share/org/apache/slide/macro/MacroPropertyUpdater.java
Index: MacroPropertyUpdater.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroPropertyUpdater.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MacroPropertyUpdater.java 28 Jul 2004 09:35:25 -0000 1.5
+++ MacroPropertyUpdater.java 1 Sep 2004 10:28:53 -0000 1.6
@@ -37,6 +37,7 @@
import org.apache.slide.security.Security;
import org.apache.slide.structure.Structure;
import org.apache.slide.structure.StructureImpl;
+import org.apache.slide.structure.SubjectNode;
import org.apache.slide.util.conf.Configurable;
import org.apache.slide.util.conf.Configuration;
import org.apache.slide.util.conf.ConfigurationException;
@@ -111,6 +112,9 @@
// update owner (if changed)
if (this.updateOwnerOnCopy) {
String newOwner = event.getToken().getCredentialsToken().getPublicCredentials();
+ if (newOwner == null || newOwner.equals("") || newOwner.equals("/")) {
+ newOwner = SubjectNode.UNAUTHENTICATED_URI;
+ }
if (!destNrd.getOwner().equals(newOwner)) {
destNrd.setOwner(newOwner);
anyThingUpdated = true;
@@ -148,6 +152,9 @@
// update owner (if changed)
if (this.updateOwnerOnMove) {
String newOwner = event.getToken().getCredentialsToken().getPublicCredentials();
+ if (newOwner == null || newOwner.equals("") || newOwner.equals("/")) {
+ newOwner = SubjectNode.UNAUTHENTICATED_URI;
+ }
if (!destNrd.getOwner().equals(newOwner)) {
anyThingUpdated = true;
destNrd.setOwner(newOwner);
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org