You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/07/08 14:15:05 UTC

svn commit: r1144280 - in /lucene/dev/trunk: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/ lucene/contrib/memory/src/java/org/apache/lucene/index/memory/ solr/src/java/org/apache/solr/core/ solr/src/java/org/apache/solr/han...

Author: simonw
Date: Fri Jul  8 12:15:04 2011
New Revision: 1144280

URL: http://svn.apache.org/viewvc?rev=1144280&view=rev
Log:
LUCENE-3294: Some code still compares string equality instead using equals

Modified:
    lucene/dev/trunk/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
    lucene/dev/trunk/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreDescriptor.java
    lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java

Modified: lucene/dev/trunk/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java?rev=1144280&r1=1144279&r2=1144280&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java (original)
+++ lucene/dev/trunk/lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java Fri Jul  8 12:15:04 2011
@@ -124,7 +124,7 @@ public class InstantiatedIndexReader ext
 
   private Map<String,List<NormUpdate>> uncommittedNormsByFieldNameAndDocumentNumber = null;
 
-  private class NormUpdate {
+  private static class NormUpdate {
     private int doc;
     private byte value;
 
@@ -380,7 +380,7 @@ public class InstantiatedIndexReader ext
               if (upto >= orderedTerms.length) {
                 return null;
               }
-            } while(orderedTerms[upto].field() == currentField);
+            } while(orderedTerms[upto].field().equals(currentField));
             
             currentField = orderedTerms[upto].field();
             return currentField;
@@ -410,7 +410,7 @@ public class InstantiatedIndexReader ext
         // do it up front & cache
         long sum = 0;
         int upto = i;
-        while(upto < orderedTerms.length && orderedTerms[i].field() == field) {
+        while(upto < orderedTerms.length && orderedTerms[i].equals(field)) {
           sum += orderedTerms[i].getTotalTermFreq();
           upto++;
         }

Modified: lucene/dev/trunk/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1144280&r1=1144279&r2=1144280&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/trunk/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Fri Jul  8 12:15:04 2011
@@ -1194,7 +1194,7 @@ public class MemoryIndex {
     public byte[] norms(String fieldName) {
       byte[] norms = cachedNorms;
       SimilarityProvider sim = getSimilarityProvider();
-      if (fieldName != cachedFieldName || sim != cachedSimilarity) { // not cached?
+      if (!fieldName.equals(cachedFieldName) || sim != cachedSimilarity) { // not cached?
         Info info = getInfo(fieldName);
         Similarity fieldSim = sim.get(fieldName);
         int numTokens = info != null ? info.numTokens : 0;

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreDescriptor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreDescriptor.java?rev=1144280&r1=1144279&r2=1144280&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreDescriptor.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/core/CoreDescriptor.java Fri Jul  8 12:15:04 2011
@@ -46,7 +46,7 @@ public class CoreDescriptor {
     if(coreContainer.getZkController() != null) {
       this.cloudDesc = new CloudDescriptor();
       // cloud collection defaults to core name
-      cloudDesc.setCollectionName(name == "" ? coreContainer.getDefaultCoreName() : name);
+      cloudDesc.setCollectionName(name.isEmpty() ? coreContainer.getDefaultCoreName() : name);
       this.cloudDesc.setShardId(coreContainer.getZkController().getNodeName() + "_" + name);
     }
     

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java?rev=1144280&r1=1144279&r2=1144280&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java Fri Jul  8 12:15:04 2011
@@ -170,7 +170,6 @@ public abstract class AnalysisRequestHan
     // for backwards compatibility, add all "common" attributes
     tokenStream.addAttribute(OffsetAttribute.class);
     tokenStream.addAttribute(TypeAttribute.class);
-    final BytesRef bytes = new BytesRef();
     try {
       tokenStream.reset();
       int position = 0;