Index: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java
===================================================================
--- lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java	(revision 1144189)
+++ lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexReader.java	(working copy)
@@ -124,7 +124,7 @@
 
   private Map<String,List<NormUpdate>> uncommittedNormsByFieldNameAndDocumentNumber = null;
 
-  private class NormUpdate {
+  private static class NormUpdate {
     private int doc;
     private byte value;
 
@@ -380,7 +380,7 @@
               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 @@
         // 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++;
         }
Index: lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
===================================================================
--- lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	(revision 1144189)
+++ lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	(working copy)
@@ -1194,7 +1194,7 @@
     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;
Index: solr/src/java/org/apache/solr/core/CoreDescriptor.java
===================================================================
--- solr/src/java/org/apache/solr/core/CoreDescriptor.java	(revision 1144189)
+++ solr/src/java/org/apache/solr/core/CoreDescriptor.java	(working copy)
@@ -46,7 +46,7 @@
     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);
     }