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 oz...@apache.org on 2004/11/27 00:37:45 UTC
cvs commit: jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd Client.java
ozeigermann 2004/11/26 15:37:45
Modified: src/share/org/apache/slide/search/basic
ComparableResourceImpl.java
src/share/org/apache/slide/security SecurityImpl.java
src/share/org/apache/slide/store BindingStore.java
src/share/org/apache/slide/structure StructureImpl.java
src/share/org/apache/slide/transaction SlideTransaction.java
src/webdav/server/org/apache/slide/webdav/method
PropFindMethod.java
src/webdav/server/org/apache/slide/webdav/util
ResourceWithProvidedProperties.java
webdavclient/commandline/src/java/org/apache/webdav/cmd
Client.java
Log:
Applied patch for issue 32392 by Taisuke Yamada
Revision Changes Path
1.13 +12 -12 jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java
Index: ComparableResourceImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ComparableResourceImpl.java 24 Nov 2004 16:20:42 -0000 1.12
+++ ComparableResourceImpl.java 26 Nov 2004 23:37:42 -0000 1.13
@@ -358,11 +358,11 @@
public Iterator getAllPropertiesNames() throws SlideException {
Set propertyNamesSet = new HashSet();
- Enumeration enum = revisionDescriptor.enumerateProperties();
+ Enumeration props = revisionDescriptor.enumerateProperties();
NodeProperty property = null;
- if (enum != null) {
- while (enum.hasMoreElements()) {
- property = (NodeProperty)enum.nextElement();
+ if (props != null) {
+ while (props.hasMoreElements()) {
+ property = (NodeProperty)props.nextElement();
propertyNamesSet.add(new PropertyName(property.getName(),
property.getNamespace()));
}
@@ -386,10 +386,10 @@
public Iterator getAllProperties() throws SlideException {
Set propertySet = new HashSet();
- Enumeration enum = revisionDescriptor.enumerateProperties();
- if (enum != null) {
- while (enum.hasMoreElements()) {
- propertySet.add(enum.nextElement());
+ Enumeration props = revisionDescriptor.enumerateProperties();
+ if (props != null) {
+ while (props.hasMoreElements()) {
+ propertySet.add(props.nextElement());
}
}
1.60 +7 -7 jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java
Index: SecurityImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- SecurityImpl.java 24 Nov 2004 16:20:42 -0000 1.59
+++ SecurityImpl.java 26 Nov 2004 23:37:42 -0000 1.60
@@ -826,9 +826,9 @@
break;
case NamespaceConfig.ACL_INHERIT_TYPE_PATH:
uri = namespace.getUri(token, object.getUri());
- Enumeration enum = uri.getScopes();
- while (enum.hasMoreElements()) {
- Uri element = namespace.getUri(token, (String)enum.nextElement());
+ Enumeration scopes = uri.getScopes();
+ while (scopes.hasMoreElements()) {
+ Uri element = namespace.getUri(token, (String)scopes.nextElement());
ObjectNode objectNode = element.getStore().retrieveObject(element);
result.add(objectNode);
}
1.7 +7 -7 jakarta-slide/src/share/org/apache/slide/store/BindingStore.java
Index: BindingStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/BindingStore.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BindingStore.java 24 Nov 2004 16:20:42 -0000 1.6
+++ BindingStore.java 26 Nov 2004 23:37:42 -0000 1.7
@@ -450,11 +450,11 @@
String result = "";
while (!resourceId.isStoreRoot()) {
ObjectNode objectNode = resourceId.getStore().retrieveObject(resourceId);
- Enumeration enum = objectNode.enumerateParentBindings();
- if (!enum.hasMoreElements()) {
+ Enumeration bindings = objectNode.enumerateParentBindings();
+ if (!bindings.hasMoreElements()) {
throw new IllegalStateException();
}
- ObjectNode.Binding parentBinding = (ObjectNode.Binding) enum.nextElement();
+ ObjectNode.Binding parentBinding = (ObjectNode.Binding) bindings.nextElement();
String parentSegment = parentBinding.getName();
result = "/" + parentSegment + result;
resourceId = ResourceId.create(resourceId, parentBinding.getUuri());
1.54 +6 -6 jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java
Index: StructureImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- StructureImpl.java 27 Oct 2004 08:29:00 -0000 1.53
+++ StructureImpl.java 26 Nov 2004 23:37:42 -0000 1.54
@@ -546,8 +546,8 @@
store(token, nodeToDelete);
}
else {
- Enumeration enum = nodeToDelete.enumerateChildren();
- if (enum.hasMoreElements()) {
+ Enumeration children = nodeToDelete.enumerateChildren();
+ if (children.hasMoreElements()) {
throw new ObjectHasChildrenException(uri);
}
uri.getStore().removeObject(uri, nodeToDelete);
1.24 +23 -23 jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java
Index: SlideTransaction.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/transaction/SlideTransaction.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- SlideTransaction.java 28 Jul 2004 09:34:33 -0000 1.23
+++ SlideTransaction.java 26 Nov 2004 23:37:42 -0000 1.24
@@ -205,14 +205,14 @@
Vector exceptions = new Vector();
boolean fail = false;
- Enumeration enum = branches.keys();
+ Enumeration keys = branches.keys();
if (enlistedResources.size() == 1) {
// One phase commit
status = Status.STATUS_COMMITTING;
- while (enum.hasMoreElements()) {
- Object key = enum.nextElement();
+ while (keys.hasMoreElements()) {
+ Object key = keys.nextElement();
XAResource resourceManager =
(XAResource) branches.get(key);
try {
@@ -242,8 +242,8 @@
// Prepare each enlisted resource
status = Status.STATUS_PREPARING;
- while ((!fail) && (enum.hasMoreElements())) {
- Object key = enum.nextElement();
+ while ((!fail) && (keys.hasMoreElements())) {
+ Object key = keys.nextElement();
XAResource resourceManager =
(XAResource) branches.get(key);
try {
@@ -270,9 +270,9 @@
status = Status.STATUS_ROLLING_BACK;
fail = false;
// Rolling back all the prepared (and unprepared) branches
- enum = branches.keys();
- while (enum.hasMoreElements()) {
- Object key = enum.nextElement();
+ keys = branches.keys();
+ while (keys.hasMoreElements()) {
+ Object key = keys.nextElement();
XAResource resourceManager =
(XAResource) branches.get(key);
try {
@@ -291,9 +291,9 @@
} else {
status = Status.STATUS_COMMITTING;
// Commit each enlisted resource
- enum = branches.keys();
- while (enum.hasMoreElements()) {
- Object key = enum.nextElement();
+ keys = branches.keys();
+ while (keys.hasMoreElements()) {
+ Object key = keys.nextElement();
XAResource resourceManager =
(XAResource) branches.get(key);
try {
@@ -322,8 +322,8 @@
}
// Parsing exception and throwing an appropriate exception
- enum = exceptions.elements();
- if (enum.hasMoreElements()) {
+ keys = exceptions.elements();
+ if (keys.hasMoreElements()) {
if ((status == Status.STATUS_ROLLEDBACK) && (!fail))
throw new RollbackException();
if (status == Status.STATUS_ROLLEDBACK)
@@ -435,9 +435,9 @@
Xid branchXid = (Xid) suspendedResources.get(xaRes);
if (branchXid == null) {
- Enumeration enum = enlistedResources.elements();
- while ((!alreadyEnlisted) && (enum.hasMoreElements())) {
- XAResource resourceManager = (XAResource) enum.nextElement();
+ Enumeration elms = enlistedResources.elements();
+ while ((!alreadyEnlisted) && (elms.hasMoreElements())) {
+ XAResource resourceManager = (XAResource) elms.nextElement();
try {
if (resourceManager.isSameRM(xaRes)) {
flag = XAResource.TMJOIN;
@@ -513,11 +513,11 @@
Vector exceptions = new Vector();
- Enumeration enum = branches.keys();
+ Enumeration keys = branches.keys();
status = Status.STATUS_ROLLING_BACK;
- while (enum.hasMoreElements()) {
- Xid xid = (Xid) enum.nextElement();
+ while (keys.hasMoreElements()) {
+ Xid xid = (Xid) keys.nextElement();
XAResource resourceManager = (XAResource) branches.get(xid);
try {
resourceManager.rollback(xid);
1.110 +7 -7 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PropFindMethod.java,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- PropFindMethod.java 24 Nov 2004 16:22:45 -0000 1.109
+++ PropFindMethod.java 26 Nov 2004 23:37:44 -0000 1.110
@@ -354,20 +354,20 @@
if (depth > 0) {
- Enumeration enum = null;
+ Enumeration children = null;
try {
- enum = structure.getChildren(slideToken, cur);
+ children = structure.getChildren(slideToken, cur);
} catch (Exception e) {
int statusCode = getErrorCode( e );
sendError( statusCode, e );
throw new WebdavException( statusCode );
}
- while (enum.hasMoreElements()) {
+ while (children.hasMoreElements()) {
// PROPFIND must not list Lock-Null resources that
// are timed out
- ObjectNode node = (ObjectNode)enum.nextElement();
+ ObjectNode node = (ObjectNode)children.nextElement();
UnlockListenerImpl listener = new UnlockListenerImpl(
slideToken, token, config, req, resp);
try {
1.6 +12 -12 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java
Index: ResourceWithProvidedProperties.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResourceWithProvidedProperties.java 28 Jul 2004 09:32:07 -0000 1.5
+++ ResourceWithProvidedProperties.java 26 Nov 2004 23:37:44 -0000 1.6
@@ -136,11 +136,11 @@
public Iterator getAllPropertiesNames() throws SlideException {
Set propertyNamesList = new HashSet();
- Enumeration enum = revisionDescriptor.enumerateProperties();
+ Enumeration props = revisionDescriptor.enumerateProperties();
NodeProperty property = null;
- if (enum != null) {
- while (enum.hasMoreElements()) {
- property = (NodeProperty)enum.nextElement();
+ if (props != null) {
+ while (props.hasMoreElements()) {
+ property = (NodeProperty)props.nextElement();
propertyNamesList.add(new PropertyName(property.getName(),
property.getNamespace()));
}
@@ -166,10 +166,10 @@
public Iterator getAllProperties() throws SlideException {
Set propertyList = new HashSet();
- Enumeration enum = revisionDescriptor.enumerateProperties();
- if (enum != null) {
- while (enum.hasMoreElements()) {
- propertyList.add(enum.nextElement());
+ Enumeration props = revisionDescriptor.enumerateProperties();
+ if (props != null) {
+ while (props.hasMoreElements()) {
+ propertyList.add(props.nextElement());
}
}
1.24 +12 -12 jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd/Client.java
Index: Client.java
===================================================================
RCS file: /home/cvs/jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd/Client.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Client.java 8 Oct 2004 15:01:22 -0000 1.23
+++ Client.java 26 Nov 2004 23:37:44 -0000 1.24
@@ -368,14 +368,14 @@
if (param != null) {
if (!param.startsWith("/")) {
httpURL = uriToHttpURL(param);
- Enumeration enum = null;
+ Enumeration opts = null;
try {
// OPTIONS business logic
- enum =
+ opts =
webdavResource.optionsMethod(httpURL);
- while (enum.hasMoreElements()) {
- out.print(enum.nextElement());
- if (enum.hasMoreElements()) {
+ while (opts.hasMoreElements()) {
+ out.print(opts.nextElement());
+ if (opts.hasMoreElements()) {
out.print(", ");
} else {
out.println();
@@ -399,13 +399,13 @@
// OPTIONS business logic
httpURL.setUserinfo(userName,
password);
- enum = webdavResource.
+ opts = webdavResource.
optionsMethod(httpURL);
while (
- enum.hasMoreElements()) {
+ opts.hasMoreElements()) {
out.print
- (enum.nextElement());
- if (enum.
+ (opts.nextElement());
+ if (opts.
hasMoreElements()) {
out.print
(", ");
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org