exo-jcr SVN: r5838 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-12 07:15:29 -0400 (Mon, 12 Mar 2012)
New Revision: 5838
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
Log:
EXOJCR-1799: Prevent an infinite loop in case a node is its own parent
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2012-03-12 11:13:29 UTC (rev 5837)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2012-03-12 11:15:29 UTC (rev 5838)
@@ -1148,11 +1148,18 @@
throw new InvalidItemStateException("Parent not found, uuid: " + getIdentifier(caid));
}
+ String cid = result.getString(COLUMN_ID);
+
QPathEntry qpe1 =
- new QPathEntry(InternalQName.parse(result.getString(COLUMN_NAME)), result.getInt(COLUMN_INDEX),
- result.getString(COLUMN_ID));
- boolean isChild = caid.equals(result.getString(COLUMN_ID));
+ new QPathEntry(InternalQName.parse(result.getString(COLUMN_NAME)), result.getInt(COLUMN_INDEX), cid);
+ boolean isChild = caid.equals(cid);
+
caid = result.getString(COLUMN_PARENTID);
+ if (cid.equals(caid))
+ {
+ throw new InvalidItemStateException("An item with id='" + getIdentifier(caid) + "' is its own parent");
+ }
+
if (result.next())
{
QPathEntry qpe2 =
14 years, 1 month
exo-jcr SVN: r5837 - jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-12 07:13:29 -0400 (Mon, 12 Mar 2012)
New Revision: 5837
Modified:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
Log:
EXOJCR-1799: Prevent an infinite loop in case a node is its own parent
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2012-03-12 08:45:59 UTC (rev 5836)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2012-03-12 11:13:29 UTC (rev 5837)
@@ -54,7 +54,16 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
import javax.jcr.InvalidItemStateException;
import javax.jcr.PropertyType;
@@ -1129,11 +1138,18 @@
throw new InvalidItemStateException("Parent not found, uuid: " + getIdentifier(caid));
}
+ String cid = result.getString(COLUMN_ID);
+
QPathEntry qpe1 =
- new QPathEntry(InternalQName.parse(result.getString(COLUMN_NAME)), result.getInt(COLUMN_INDEX),
- result.getString(COLUMN_ID));
- boolean isChild = caid.equals(result.getString(COLUMN_ID));
+ new QPathEntry(InternalQName.parse(result.getString(COLUMN_NAME)), result.getInt(COLUMN_INDEX), cid);
+ boolean isChild = caid.equals(cid);
caid = result.getString(COLUMN_PARENTID);
+
+ if (cid.equals(caid))
+ {
+ throw new InvalidItemStateException("An item with id='" + getIdentifier(caid) + "' is its own parent");
+ }
+
if (result.next())
{
QPathEntry qpe2 =
14 years, 1 month
exo-jcr SVN: r5836 - in core/branches/2.3.x/patch: 2.3.13 and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-12 04:45:59 -0400 (Mon, 12 Mar 2012)
New Revision: 5836
Added:
core/branches/2.3.x/patch/2.3.13/
core/branches/2.3.x/patch/2.3.13/COR-248/
core/branches/2.3.x/patch/2.3.13/COR-248/COR-248.patch
Log:
COR-248: patch proposed
Added: core/branches/2.3.x/patch/2.3.13/COR-248/COR-248.patch
===================================================================
--- core/branches/2.3.x/patch/2.3.13/COR-248/COR-248.patch (rev 0)
+++ core/branches/2.3.x/patch/2.3.13/COR-248/COR-248.patch 2012-03-12 08:45:59 UTC (rev 5836)
@@ -0,0 +1,29 @@
+Index: packaging/module/src/main/javascript/core.packaging.module.js
+===================================================================
+--- packaging/module/src/main/javascript/core.packaging.module.js (revision 5833)
++++ packaging/module/src/main/javascript/core.packaging.module.js (working copy)
+@@ -38,8 +38,9 @@
+
+ module.component.documents =
+ new Project("org.exoplatform.core", "exo.core.component.document", "jar", module.version).
+- addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.1.0")).
+- addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.1.0")).
++ addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.1.0-eXo01")).
++ addDependency(new Project("org.apache.pdfbox", "fontbox", "jar", "1.1.0-eXo01")).
++ addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.1.0-eXo01")).
+ addDependency(new Project("com.lowagie", "itext", "jar", "2.1.0")).
+ addDependency(new Project("bouncycastle", "bcmail-jdk14", "jar", "136")).
+ addDependency(new Project("bouncycastle", "bcprov-jdk14", "jar", "136")).
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 5833)
++++ pom.xml (working copy)
+@@ -269,7 +269,7 @@
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+- <version>1.1.0</version>
++ <version>1.1.0-eXo01</version>
+ </dependency>
+
+ <dependency>
14 years, 1 month
exo-jcr SVN: r5834 - in core/branches/2.3.x/patch: 2.3.12 and 1 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-12 04:17:05 -0400 (Mon, 12 Mar 2012)
New Revision: 5834
Added:
core/branches/2.3.x/patch/2.3.12/
core/branches/2.3.x/patch/2.3.12/COR-248/
core/branches/2.3.x/patch/2.3.12/COR-248/COR-248.patch
Log:
COR-248: patch proposed
Added: core/branches/2.3.x/patch/2.3.12/COR-248/COR-248.patch
===================================================================
--- core/branches/2.3.x/patch/2.3.12/COR-248/COR-248.patch (rev 0)
+++ core/branches/2.3.x/patch/2.3.12/COR-248/COR-248.patch 2012-03-12 08:17:05 UTC (rev 5834)
@@ -0,0 +1,29 @@
+Index: packaging/module/src/main/javascript/core.packaging.module.js
+===================================================================
+--- packaging/module/src/main/javascript/core.packaging.module.js (revision 5833)
++++ packaging/module/src/main/javascript/core.packaging.module.js (working copy)
+@@ -38,8 +38,9 @@
+
+ module.component.documents =
+ new Project("org.exoplatform.core", "exo.core.component.document", "jar", module.version).
+- addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.1.0")).
+- addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.1.0")).
++ addDependency(new Project("org.apache.pdfbox", "pdfbox", "jar", "1.1.0-exo01")).
++ addDependency(new Project("org.apache.pdfbox", "fontbox", "jar", "1.1.0-exo01")).
++ addDependency(new Project("org.apache.pdfbox", "jempbox", "jar", "1.1.0-exo01")).
+ addDependency(new Project("com.lowagie", "itext", "jar", "2.1.0")).
+ addDependency(new Project("bouncycastle", "bcmail-jdk14", "jar", "136")).
+ addDependency(new Project("bouncycastle", "bcprov-jdk14", "jar", "136")).
+Index: pom.xml
+===================================================================
+--- pom.xml (revision 5833)
++++ pom.xml (working copy)
+@@ -269,7 +269,7 @@
+ <dependency>
+ <groupId>org.apache.pdfbox</groupId>
+ <artifactId>pdfbox</artifactId>
+- <version>1.1.0</version>
++ <version>1.1.0-exo01</version>
+ </dependency>
+
+ <dependency>
14 years, 1 month
exo-jcr SVN: r5833 - jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-12 03:04:31 -0400 (Mon, 12 Mar 2012)
New Revision: 5833
Modified:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
Log:
EXOJCR-1799: Prevent an infinite loop in case a node is its own parent
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2012-03-12 07:02:49 UTC (rev 5832)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2012-03-12 07:04:31 UTC (rev 5833)
@@ -1671,6 +1671,11 @@
new QPathEntry(InternalQName.parse(parent.getString(COLUMN_NAME)), parent.getInt(COLUMN_INDEX), caid);
qrpath.add(qpe);
caid = parent.getString(COLUMN_PARENTID);
+
+ if (caid.equals(parent.getString(COLUMN_ID)))
+ {
+ throw new InvalidItemStateException("An item with id='" + getIdentifier(caid) + "' is its own parent");
+ }
}
finally
{
14 years, 1 month
exo-jcr SVN: r5832 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-12 03:02:49 -0400 (Mon, 12 Mar 2012)
New Revision: 5832
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
Log:
EXOJCR-1799: Prevent an infinite loop in case a node is its own parent
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2012-03-09 12:27:21 UTC (rev 5831)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2012-03-12 07:02:49 UTC (rev 5832)
@@ -1620,6 +1620,11 @@
new QPathEntry(InternalQName.parse(parent.getString(COLUMN_NAME)), parent.getInt(COLUMN_INDEX), caid);
qrpath.add(qpe);
caid = parent.getString(COLUMN_PARENTID);
+
+ if (caid.equals(parent.getString(COLUMN_ID)))
+ {
+ throw new InvalidItemStateException("An item with id='" + getIdentifier(caid) + "' is its own parent");
+ }
}
finally
{
14 years, 1 month
exo-jcr SVN: r5831 - in jcr/trunk: exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan and 3 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2012-03-09 07:27:21 -0500 (Fri, 09 Mar 2012)
New Revision: 5831
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheKey.java
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/cluster/infinispan-data.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml
jcr/trunk/pom.xml
Log:
EXOJCR-1789: Upgrade ISPN to 5.1.2 FINAL and indirectly to JGroups 3.0.6.Final
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheKey.java
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheKey.java 2012-03-09 12:25:55 UTC (rev 5830)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/infinispan/CacheKey.java 2012-03-09 12:27:21 UTC (rev 5831)
@@ -45,21 +45,21 @@
* the workspace is not distributed the value of this variable will be
* null to avoid consuming more memory for nothing
*/
- protected String ownerId;
+ private String ownerId;
- protected String id;
+ private String id;
- protected int hash;
+ private int hash;
/**
* The value used in case, the grouping is enabled
*/
- protected String group;
+ private String group;
/**
* The full name of the group
*/
- protected String fullGroupName;
+ private String fullGroupName;
public CacheKey()
{
@@ -74,7 +74,11 @@
{
this.ownerId = ownerId;
this.id = id;
- this.hash = id.hashCode();
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((ownerId == null) ? 0 : ownerId.hashCode());
+ this.hash = result;
this.group = group;
}
@@ -195,7 +199,11 @@
buf = new byte[in.readInt()];
in.readFully(buf);
id = new String(buf, Constants.DEFAULT_ENCODING);
- hash = id.hashCode();
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((ownerId == null) ? 0 : ownerId.hashCode());
+ hash = result;
}
/**
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-03-09 12:25:55 UTC (rev 5830)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/cache-server-configuration.xml 2012-03-09 12:27:21 UTC (rev 5831)
@@ -33,7 +33,7 @@
<description>The parameters of the configuration</description>
<property name="configurationFile" value="udp-mux-v3.xml"></property>
<property name="invalidationThreshold" value="0"></property>
- <property name="numOwners" value="3"></property>
+ <property name="numOwners" value="2"></property>
<property name="numVirtualNodes" value="1"></property>
</properties-param>
<properties-param profiles="tcp">
@@ -41,7 +41,7 @@
<description>The parameters of the configuration</description>
<property name="configurationFile" value="tcp-mux-v3.xml"></property>
<property name="invalidationThreshold" value="-1"></property>
- <property name="numOwners" value="3"></property>
+ <property name="numOwners" value="2"></property>
<property name="numVirtualNodes" value="1"></property>
</properties-param>
</init-params>
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/cluster/infinispan-data.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/cluster/infinispan-data.xml 2012-03-09 12:25:55 UTC (rev 5830)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/portal/cluster/infinispan-data.xml 2012-03-09 12:27:21 UTC (rev 5831)
@@ -49,7 +49,7 @@
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="true"/>
<transaction transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true" transactionMode="TRANSACTIONAL"/>
<jmxStatistics enabled="true"/>
- <eviction strategy="LRU" threadPolicy="DEFAULT" maxEntries="1000000"/>
+ <eviction strategy="LIRS" threadPolicy="DEFAULT" maxEntries="1000000"/>
<expiration wakeUpInterval="5000"/>
</default>
</infinispan>
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml 2012-03-09 12:25:55 UTC (rev 5830)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml 2012-03-09 12:27:21 UTC (rev 5831)
@@ -36,7 +36,7 @@
<jmxStatistics enabled="true"/>
<clustering mode="distribution">
<l1 enabled="true" invalidationThreshold="-1"/>
- <hash numOwners="3" rehashRpcTimeout="120000">
+ <hash numOwners="2" rehashRpcTimeout="120000">
<groups enabled="true"/>
</hash>
<sync replTimeout="180000"/>
@@ -48,7 +48,7 @@
<jmxStatistics enabled="true"/>
<clustering mode="distribution">
<l1 enabled="true" invalidationThreshold="-1"/>
- <hash numOwners="3" rehashRpcTimeout="120000"/>
+ <hash numOwners="2" rehashRpcTimeout="120000"/>
<sync replTimeout="180000"/>
</clustering>
</namedCache>
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml 2012-03-09 12:25:55 UTC (rev 5830)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-infinispan-config.xml 2012-03-09 12:27:21 UTC (rev 5831)
@@ -49,7 +49,7 @@
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500" useLockStriping="true"/>
<transaction transactionManagerLookupClass="org.exoplatform.services.transaction.infinispan.JBossStandaloneJTAManagerLookup" syncRollbackPhase="true" syncCommitPhase="true"/>
<jmxStatistics enabled="true"/>
- <eviction strategy="LRU" threadPolicy="DEFAULT" maxEntries="1000000"/>
+ <eviction strategy="LIRS" threadPolicy="DEFAULT" maxEntries="1000000"/>
<expiration wakeUpInterval="5000"/>
</default>
</infinispan>
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2012-03-09 12:25:55 UTC (rev 5830)
+++ jcr/trunk/pom.xml 2012-03-09 12:27:21 UTC (rev 5831)
@@ -397,12 +397,12 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>5.1.1.FINAL</version>
+ <version>5.1.2.FINAL</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
- <version>5.1.1.FINAL</version>
+ <version>5.1.2.FINAL</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
14 years, 1 month
exo-jcr SVN: r5830 - in kernel/trunk: exo.kernel.component.ext.cache.impl.infinispan.v5 and 2 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2012-03-09 07:25:55 -0500 (Fri, 09 Mar 2012)
New Revision: 5830
Modified:
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/distributed/TestDistributedExoCache.java
kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml
kernel/trunk/pom.xml
Log:
EXOJCR-1789: Upgrade ISPN to 5.1.2 FINAL and indirectly to JGroups 3.0.6.Final
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-03-09 11:48:34 UTC (rev 5829)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-03-09 12:25:55 UTC (rev 5830)
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>3.0.4.Final</version>
+ <version>3.0.6.Final</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/distributed/TestDistributedExoCache.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/distributed/TestDistributedExoCache.java 2012-03-09 11:48:34 UTC (rev 5829)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/src/test/java/org/exoplatform/services/cache/impl/infinispan/distributed/TestDistributedExoCache.java 2012-03-09 12:25:55 UTC (rev 5830)
@@ -510,7 +510,7 @@
}
}
- public static class MyKeyGenerator implements KeyGenerator<DistributedExoCache.CacheKey<MyKey>>
+ public static class MyKeyGenerator implements KeyGenerator<DistributedExoCache.CacheKey<Serializable>>
{
public static final Random rnd = new Random();
@@ -523,9 +523,9 @@
}
@Override
- public DistributedExoCache.CacheKey<MyKey> getKey()
+ public DistributedExoCache.CacheKey<Serializable> getKey()
{
- return new DistributedExoCache.CacheKey<MyKey>(fullName, new MyKey(rnd.nextLong()));
+ return new DistributedExoCache.CacheKey<Serializable>(fullName, new MyKey(rnd.nextLong()));
}
}
Modified: kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-03-09 11:48:34 UTC (rev 5829)
+++ kernel/trunk/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-03-09 12:25:55 UTC (rev 5830)
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>3.0.4.Final</version>
+ <version>3.0.6.Final</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2012-03-09 11:48:34 UTC (rev 5829)
+++ kernel/trunk/pom.xml 2012-03-09 12:25:55 UTC (rev 5830)
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>5.1.1.FINAL</version>
+ <version>5.1.2.FINAL</version>
</dependency>
<dependency>
<groupId>org.jibx</groupId>
14 years, 1 month
exo-jcr SVN: r5829 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2012-03-09 06:48:34 -0500 (Fri, 09 Mar 2012)
New Revision: 5829
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DocNumberCache.java
Log:
EXOJCR-1800: [Port] Abuse of INFO level logging for DocNumberCache.get()
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DocNumberCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DocNumberCache.java 2012-03-07 11:01:19 UTC (rev 5828)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/DocNumberCache.java 2012-03-09 11:48:34 UTC (rev 5829)
@@ -150,7 +150,7 @@
{
entry = (Entry)cacheSegment.get(key);
}
- if (log.isInfoEnabled())
+ if (log.isDebugEnabled())
{
accesses++;
if (entry == null)
@@ -165,7 +165,7 @@
{
ratio -= misses * 100L / accesses;
}
- StringBuffer statistics = new StringBuffer();
+ StringBuilder statistics = new StringBuilder();
int inUse = 0;
for (int i = 0; i < docNumbers.length; i++)
{
@@ -177,7 +177,7 @@
statistics.append(", #hits=").append((accesses - misses));
statistics.append(", #misses=").append(misses);
statistics.append(", cacheRatio=").append(ratio).append("%");
- log.info(statistics.toString());
+ log.debug(statistics.toString());
accesses = 0;
misses = 0;
lastLog = System.currentTimeMillis();
14 years, 1 month