You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2007/09/28 13:52:20 UTC
svn commit: r580322 - in
/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi:
WorkspaceManager.java nodetype/NodeTypeManagerImpl.java
Author: reschke
Date: Fri Sep 28 04:52:19 2007
New Revision: 580322
URL: http://svn.apache.org/viewvc?rev=580322&view=rev
Log:
JCR-1149: fix typos in equals() invocations (causing code never to be reached)
Modified:
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java?rev=580322&r1=580321&r2=580322&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java Fri Sep 28 04:52:19 2007
@@ -558,7 +558,7 @@
public boolean canAccess(String workspaceName) throws NoSuchWorkspaceException, RepositoryException {
String[] wspNames = getWorkspaceNames();
for (int i = 0; i < wspNames.length; i++) {
- if (wspNames[i].equals(wspNames)) {
+ if (wspNames[i].equals(workspaceName)) {
return true;
}
}
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java?rev=580322&r1=580321&r2=580322&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java Fri Sep 28 04:52:19 2007
@@ -215,7 +215,7 @@
Iterator iter = pdCache.values().iterator();
while (iter.hasNext()) {
PropertyDefinition pd = (PropertyDefinition) iter.next();
- if (name.equals(pd.getDeclaringNodeType())) {
+ if (name.equals(pd.getDeclaringNodeType().getName())) {
iter.remove();
}
}
@@ -224,7 +224,7 @@
Iterator iter = ndCache.values().iterator();
while (iter.hasNext()) {
NodeDefinition nd = (NodeDefinition) iter.next();
- if (name.equals(nd.getDeclaringNodeType())) {
+ if (name.equals(nd.getDeclaringNodeType().getName())) {
iter.remove();
}
}
@@ -252,7 +252,7 @@
Iterator iter = pdCache.values().iterator();
while (iter.hasNext()) {
PropertyDefinition pd = (PropertyDefinition) iter.next();
- if (name.equals(pd.getDeclaringNodeType())) {
+ if (name.equals(pd.getDeclaringNodeType().getName())) {
iter.remove();
}
}
@@ -261,7 +261,7 @@
Iterator iter = ndCache.values().iterator();
while (iter.hasNext()) {
NodeDefinition nd = (NodeDefinition) iter.next();
- if (name.equals(nd.getDeclaringNodeType())) {
+ if (name.equals(nd.getDeclaringNodeType().getName())) {
iter.remove();
}
}