JBoss hornetq SVN: r10603 - trunk/hornetq-rest.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 07:48:43 -0400 (Mon, 09 May 2011)
New Revision: 10603
Modified:
trunk/hornetq-rest/pom.xml
Log:
mvn: Remove duplicate & incorrect(!) entry for Findbugs
(Why rest/pom.xml reclares everything?)
Modified: trunk/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/pom.xml 2011-05-09 11:48:23 UTC (rev 10602)
+++ trunk/hornetq-rest/pom.xml 2011-05-09 11:48:43 UTC (rev 10603)
@@ -228,15 +228,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <effort>Max</effort>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
14 years, 12 months
JBoss hornetq SVN: r10602 - trunk/hornetq-rest.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 07:48:23 -0400 (Mon, 09 May 2011)
New Revision: 10602
Modified:
trunk/hornetq-rest/pom.xml
Log:
mvn: Remove commented out sections.
Modified: trunk/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/pom.xml 2011-05-07 00:53:49 UTC (rev 10601)
+++ trunk/hornetq-rest/pom.xml 2011-05-09 11:48:23 UTC (rev 10602)
@@ -112,37 +112,10 @@
<id>maven2-repository.dev.java.net</id>
<url>http://download.java.net/maven/2</url>
</pluginRepository>
- <!-- <pluginRepository> -->
- <!-- <id>maven-repository.dev.java.net</id> -->
- <!-- <name>Java.net Maven 1 Repository (legacy)</name> -->
- <!-- <url>http://download.java.net/maven/1</url> -->
- <!-- <layout>legacy</layout> -->
- <!-- </pluginRepository> -->
</pluginRepositories>
<build>
<pluginManagement>
<plugins>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>512m</maxmemory>
- <quiet>false</quiet>
- <aggregate>true</aggregate>
- </configuration>
- <executions>
- <execution>
- <id>javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -285,28 +258,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- <configuration>
- <type>range</type>
- <range>30</range>
- <headingDateFormat>dd MMM, yyyy</headingDateFormat>
- </configuration>
- </plugin>
- -->
</plugins>
</reporting>
</project>
14 years, 12 months
JBoss hornetq SVN: r10601 - branches.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-05-06 20:53:49 -0400 (Fri, 06 May 2011)
New Revision: 10601
Added:
branches/Branch_2_2_2_REST/
Log:
2.2.3 rest release
15 years
JBoss hornetq SVN: r10600 - branches.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-05-06 20:52:13 -0400 (Fri, 06 May 2011)
New Revision: 10600
Removed:
branches/Branch_2_2_2_REST/
Log:
restart
15 years
JBoss hornetq SVN: r10599 - branches.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-05-06 20:09:47 -0400 (Fri, 06 May 2011)
New Revision: 10599
Added:
branches/Branch_2_2_2_REST/
Log:
branch
15 years
JBoss hornetq SVN: r10598 - trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-05 16:08:36 -0400 (Thu, 05 May 2011)
New Revision: 10598
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
Log:
JBPAPP-6466 - avoiding Timeout message that is not needed
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-05-05 20:08:16 UTC (rev 10597)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-05-05 20:08:36 UTC (rev 10598)
@@ -27,7 +27,6 @@
import java.util.TreeMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -573,73 +572,44 @@
public void close() throws Exception
{
final long tx = store.generateUniqueID();
-
- final ArrayList<Exception> ex = new ArrayList<Exception>();
-
- final AtomicBoolean isPersistent = new AtomicBoolean(false);
-
- // We can't delete the records at the caller's thread
- // because an executor may be holding the synchronized on PageCursorImpl
- // what would lead to a dead lock
- // so, we delete it inside the executor also
- // and wait for the result
- // The caller will be treating eventual IO exceptions and dispatching to the original thread's caller
- executor.execute(new Runnable()
+ try
{
-
- public void run()
+
+ boolean isPersistent = false;
+
+ synchronized (PageSubscriptionImpl.this)
{
- try
+ for (PageCursorInfo cursor : consumedPages.values())
{
- synchronized (PageSubscriptionImpl.this)
+ for (PagePosition info : cursor.acks)
{
- for (PageCursorInfo cursor : consumedPages.values())
+ if (info.getRecordID() != 0)
{
- for (PagePosition info : cursor.acks)
- {
- if (info.getRecordID() != 0)
- {
- isPersistent.set(true);
- store.deleteCursorAcknowledgeTransactional(tx, info.getRecordID());
- }
- }
+ isPersistent = true;
+ store.deleteCursorAcknowledgeTransactional(tx, info.getRecordID());
}
}
}
- catch (Exception e)
- {
- ex.add(e);
- PageSubscriptionImpl.log.warn(e.getMessage(), e);
- }
}
- });
-
- Future future = new Future();
-
- executor.execute(future);
-
- while (!future.await(5000))
- {
- PageSubscriptionImpl.log.warn("Timeout on waiting cursor " + this + " to be closed");
- }
-
- if (isPersistent.get())
- {
- // Another reason to perform the commit at the main thread is because the OperationContext may only send the
- // result to the client when
- // the IO on commit is done
- if (ex.size() == 0)
+
+ if (isPersistent)
{
store.commit(tx);
}
- else
+
+ cursorProvider.close(this);
+ }
+ catch (Exception e)
+ {
+ try
{
store.rollback(tx);
- throw ex.get(0);
}
+ catch (Exception ignored)
+ {
+ // exception of the exception.. nothing that can be done here
+ }
}
-
- cursorProvider.close(this);
}
/* (non-Javadoc)
15 years
JBoss hornetq SVN: r10597 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-05 16:08:16 -0400 (Thu, 05 May 2011)
New Revision: 10597
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
Log:
JBPAPP-6466 - avoiding Timeout message that is not needed
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-05-05 17:20:45 UTC (rev 10596)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/cursor/impl/PageSubscriptionImpl.java 2011-05-05 20:08:16 UTC (rev 10597)
@@ -27,7 +27,6 @@
import java.util.TreeMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -573,73 +572,44 @@
public void close() throws Exception
{
final long tx = store.generateUniqueID();
-
- final ArrayList<Exception> ex = new ArrayList<Exception>();
-
- final AtomicBoolean isPersistent = new AtomicBoolean(false);
-
- // We can't delete the records at the caller's thread
- // because an executor may be holding the synchronized on PageCursorImpl
- // what would lead to a dead lock
- // so, we delete it inside the executor also
- // and wait for the result
- // The caller will be treating eventual IO exceptions and dispatching to the original thread's caller
- executor.execute(new Runnable()
+ try
{
-
- public void run()
+
+ boolean isPersistent = false;
+
+ synchronized (PageSubscriptionImpl.this)
{
- try
+ for (PageCursorInfo cursor : consumedPages.values())
{
- synchronized (PageSubscriptionImpl.this)
+ for (PagePosition info : cursor.acks)
{
- for (PageCursorInfo cursor : consumedPages.values())
+ if (info.getRecordID() != 0)
{
- for (PagePosition info : cursor.acks)
- {
- if (info.getRecordID() != 0)
- {
- isPersistent.set(true);
- store.deleteCursorAcknowledgeTransactional(tx, info.getRecordID());
- }
- }
+ isPersistent = true;
+ store.deleteCursorAcknowledgeTransactional(tx, info.getRecordID());
}
}
}
- catch (Exception e)
- {
- ex.add(e);
- PageSubscriptionImpl.log.warn(e.getMessage(), e);
- }
}
- });
-
- Future future = new Future();
-
- executor.execute(future);
-
- while (!future.await(5000))
- {
- PageSubscriptionImpl.log.warn("Timeout on waiting cursor " + this + " to be closed");
- }
-
- if (isPersistent.get())
- {
- // Another reason to perform the commit at the main thread is because the OperationContext may only send the
- // result to the client when
- // the IO on commit is done
- if (ex.size() == 0)
+
+ if (isPersistent)
{
store.commit(tx);
}
- else
+
+ cursorProvider.close(this);
+ }
+ catch (Exception e)
+ {
+ try
{
store.rollback(tx);
- throw ex.get(0);
}
+ catch (Exception ignored)
+ {
+ // exception of the exception.. nothing that can be done here
+ }
}
-
- cursorProvider.close(this);
}
/* (non-Javadoc)
15 years
JBoss hornetq SVN: r10595 - in trunk/hornetq-core/src/main/java/org/hornetq/core: journal and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-05 13:20:21 -0400 (Thu, 05 May 2011)
New Revision: 10595
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/filter/impl/Identifier.java
trunk/hornetq-core/src/main/java/org/hornetq/core/journal/RecordInfo.java
Log:
Fix: .equals() didn't check for null argument
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/filter/impl/Identifier.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/filter/impl/Identifier.java 2011-05-05 17:19:40 UTC (rev 10594)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/filter/impl/Identifier.java 2011-05-05 17:20:21 UTC (rev 10595)
@@ -38,9 +38,10 @@
{
private final SimpleString name;
+ private final int hash;
+
private Object value;
- private final int hash;
public Identifier(final SimpleString name)
{
@@ -60,7 +61,7 @@
@Override
public boolean equals(final Object obj)
{
- if (obj.getClass() != Identifier.class)
+ if (!(obj instanceof Identifier))
{
return false;
}
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/journal/RecordInfo.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/journal/RecordInfo.java 2011-05-05 17:19:40 UTC (rev 10594)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/journal/RecordInfo.java 2011-05-05 17:20:21 UTC (rev 10595)
@@ -63,6 +63,10 @@
@Override
public boolean equals(final Object other)
{
+ if (!(other instanceof RecordInfo))
+ {
+ return false;
+ }
RecordInfo r = (RecordInfo)other;
return r.id == id;
15 years
JBoss hornetq SVN: r10594 - trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-05 13:19:40 -0400 (Thu, 05 May 2011)
New Revision: 10594
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/Validators.java
Log:
Findbugs: make static fields all final.
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/Validators.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/Validators.java 2011-05-05 14:37:04 UTC (rev 10593)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/Validators.java 2011-05-05 17:19:40 UTC (rev 10594)
@@ -17,27 +17,18 @@
import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
/**
- * A Validators
+ * A Validators.
*
* @author jmesnil
- *
- *
*/
-public class Validators
+public final class Validators
{
-
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
public static interface Validator
{
void validate(String name, Object value);
}
- public static Validator NO_CHECK = new Validator()
+ public static final Validator NO_CHECK = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -45,7 +36,7 @@
}
};
- public static Validator NOT_NULL_OR_EMPTY = new Validator()
+ public static final Validator NOT_NULL_OR_EMPTY = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -57,7 +48,7 @@
}
};
- public static Validator GT_ZERO = new Validator()
+ public static final Validator GT_ZERO = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -73,7 +64,7 @@
}
};
- public static Validator PERCENTAGE = new Validator()
+ public static final Validator PERCENTAGE = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -87,7 +78,7 @@
}
};
- public static Validator GE_ZERO = new Validator()
+ public static final Validator GE_ZERO = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -105,7 +96,7 @@
}
};
- public static Validator MINUS_ONE_OR_GT_ZERO = new Validator()
+ public static final Validator MINUS_ONE_OR_GT_ZERO = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -123,7 +114,7 @@
}
};
- public static Validator MINUS_ONE_OR_GE_ZERO = new Validator()
+ public static final Validator MINUS_ONE_OR_GE_ZERO = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -186,17 +177,4 @@
}
}
};
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
15 years