You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/05/21 15:24:07 UTC
svn commit: r1484796 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/util/SolrLogLayout.java
Author: markrmiller
Date: Tue May 21 13:24:07 2013
New Revision: 1484796
URL: http://svn.apache.org/r1484796
Log:
test logging: key by hashCode
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java?rev=1484796&r1=1484795&r2=1484796&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java Tue May 21 13:24:07 2013
@@ -81,15 +81,7 @@ public class SolrLogLayout extends Layou
Map<String,Object> coreProps;
}
- Map<SolrCore,CoreInfo> coreInfoMap = new WeakHashMap<SolrCore,CoreInfo>(); // TODO:
- // use
- // something
- // that
- // survives
- // across
- // a
- // core
- // reload?
+ Map<Integer,CoreInfo> coreInfoMap = new WeakHashMap<Integer,CoreInfo>();
public Map<String,String> classAliases = new HashMap<String,String>();
@@ -145,11 +137,11 @@ public class SolrLogLayout extends Layou
CoreInfo info = null;
if (core != null) {
- info = coreInfoMap.get(core);
+ info = coreInfoMap.get(core.hashCode());
if (info == null) {
info = new CoreInfo();
info.shortId = "C" + Integer.toString(CoreInfo.maxCoreNum++);
- coreInfoMap.put(core, info);
+ coreInfoMap.put(core.hashCode(), info);
if (sb.length() == 0) sb.append("ASYNC ");
sb.append(" NEW_CORE " + info.shortId);