[jboss-cvs] JBossAS SVN: r107136 - in projects/cluster/ha-server-core/trunk: src/main/java/org/jboss/ha/core/jgroups/blocks/mux and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 27 22:44:47 EDT 2010
Author: pferraro
Date: 2010-07-27 22:44:46 -0400 (Tue, 27 Jul 2010)
New Revision: 107136
Modified:
projects/cluster/ha-server-core/trunk/pom.xml
projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/jgroups/blocks/mux/MuxUpHandler.java
Log:
Refreshed dependencies.
JGroups upgrade.
Modified: projects/cluster/ha-server-core/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-core/trunk/pom.xml 2010-07-28 02:37:19 UTC (rev 107135)
+++ projects/cluster/ha-server-core/trunk/pom.xml 2010-07-28 02:44:46 UTC (rev 107136)
@@ -30,40 +30,15 @@
</scm>
<properties>
- <version.jboss.ha.server.api>2.0.0.Alpha4</version.jboss.ha.server.api>
- <version.jboss.ha.server.cache.spi>2.2.0.Final</version.jboss.ha.server.cache.spi>
- <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
- <version.jboss.logging>3.0.0.Beta2</version.jboss.logging>
- <version.infinispan>4.0.0.GA</version.infinispan>
- <version.jgroups>2.10.0.CR1</version.jgroups>
- <version.junit>3.8.1</version.junit>
+ <version.jboss.ha.server.api>2.0.0-SNAPSHOT</version.jboss.ha.server.api>
+ <version.jboss.ha.server.cache.spi>3.0.0-SNAPSHOT</version.jboss.ha.server.cache.spi>
+ <version.jgroups>2.10.0.GA</version.jgroups>
+ <version.junit>4.8.1</version.junit>
</properties>
<build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <!-- by default, compile to JDK 1.6 compatibility (individual modules and/or user can override) -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
+ <plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <printSummary>true</printSummary>
- <disableXmlReport>false</disableXmlReport>
- <!--<testFailureIgnore>true</testFailureIgnore>-->
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-9</version>
<configuration>
@@ -82,49 +57,14 @@
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-api</artifactId>
<version>${version.jboss.ha.server.api}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>jboss-ha-server-cache-spi</artifactId>
<version>${version.jboss.ha.server.cache.spi}</version>
- <exclusions>
- <exclusion>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </exclusion>
- </exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <version>${version.jboss.common.core}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>${version.jboss.logging}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>${version.jgroups}</version>
- <optional>true</optional>
- </dependency>
-
<!-- Test dependencies -->
<dependency>
@@ -141,7 +81,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3.1</version>
</plugin>
</plugins>
</reporting>
Modified: projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/jgroups/blocks/mux/MuxUpHandler.java
===================================================================
--- projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/jgroups/blocks/mux/MuxUpHandler.java 2010-07-28 02:37:19 UTC (rev 107135)
+++ projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/jgroups/blocks/mux/MuxUpHandler.java 2010-07-28 02:44:46 UTC (rev 107136)
@@ -2,12 +2,12 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicReference;
import org.jgroups.Event;
import org.jgroups.UpHandler;
import org.jgroups.blocks.mux.MuxHeader;
import org.jgroups.stack.StateTransferInfo;
+import org.jgroups.util.ImmutableReference;
/**
* Overrides superclass to allow state transfer multiplexing.
@@ -60,25 +60,25 @@
stateTransferHandlers.remove(id);
}
- /**
- * {@inheritDoc}
- * @see org.jgroups.UpHandler#up(org.jgroups.Event)
- */
- @Override
- protected AtomicReference<Object> handleStateTransferEvent(Event evt) {
-
- StateTransferInfo info=(StateTransferInfo)evt.getArg();
- for (UpHandler uh: stateTransferHandlers.values())
- {
- if (uh instanceof StateTransferFilter)
- {
- if (((StateTransferFilter) uh).accepts(info.state_id))
- {
- return new AtomicReference<Object>(uh.up(evt));
- }
- }
- }
-
- return null;
- }
+ /**
+ * {@inheritDoc}
+ * @see org.jgroups.blocks.mux.MuxUpHandler#handleStateTransferEvent(org.jgroups.Event)
+ */
+ @Override
+ protected ImmutableReference<Object> handleStateTransferEvent(Event evt)
+ {
+ StateTransferInfo info=(StateTransferInfo)evt.getArg();
+ for (UpHandler uh: stateTransferHandlers.values())
+ {
+ if (uh instanceof StateTransferFilter)
+ {
+ if (((StateTransferFilter) uh).accepts(info.state_id))
+ {
+ return new ImmutableReference<Object>(uh.up(evt));
+ }
+ }
+ }
+
+ return null;
+ }
}
More information about the jboss-cvs-commits
mailing list