date:20150923

activemq git commit: https://issues.apache.org/jira/browse/AMQ-5960 - rework fix to reset the next sequence so that the next ack position and message reference gets cleared up in normal operation

2015-09-23 Thread gtully

Repository: activemq
Updated Branches:
  refs/heads/master 86c826c46 -> fcabcd282


https://issues.apache.org/jira/browse/AMQ-5960 - rework fix to reset the next 
sequence so that the next ack position and message reference gets cleared up in 
normal operation


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/fcabcd28
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/fcabcd28
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/fcabcd28

Branch: refs/heads/master
Commit: fcabcd282dc01c6faaff3c7627882f42a64543b4
Parents: 86c826c
Author: gtully 
Authored: Wed Sep 23 13:15:29 2015 +0100
Committer: gtully 
Committed: Wed Sep 23 13:15:29 2015 +0100

--
 .../activemq/store/kahadb/MessageDatabase.java  | 21 +---
 1 file changed, 9 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/fcabcd28/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 815b9df..3512190 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -1319,7 +1319,7 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 
 // Add the message.
 int priority = command.getPrioritySupported() ? command.getPriority() 
: javax.jms.Message.DEFAULT_PRIORITY;
-long id = sd.orderIndex.getNextMessageId(priority);
+long id = sd.orderIndex.getNextMessageId();
 Long previous = sd.locationIndex.put(tx, location, id);
 if (previous == null) {
 previous = sd.messageIdIndex.put(tx, command.getMessageId(), id);
@@ -1346,16 +1346,9 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 // added message. We don't want to assign it a new id as the other 
indexes would
 // be wrong..
 sd.locationIndex.put(tx, location, previous);
+// ensure sequence is not broken
+sd.orderIndex.revertNextMessageId();
 metadata.lastUpdate = location;
-// remove ack positions
-if (sd.subscriptions != null && !sd.subscriptions.isEmpty(tx)) {
-Iterator> it = 
sd.ackPositions.iterator(tx);
-while (it.hasNext()) {
-Entry entry = it.next();
-entry.getValue().remove(id);
-}
-}
-
 }
 // record this id in any event, initial send or recovery
 metadata.producerSequenceIdTracker.isDuplicate(command.getMessageId());
@@ -1443,7 +1436,7 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 removeAckLocation(command, tx, sd, subscriptionKey, sequence);
 metadata.lastUpdate = ackLocation;
 } else if (LOG.isDebugEnabled()) {
-LOG.debug("no message sequence exists for id: " + 
command.getMessageId() + " and sub: " + command.getSubscriptionKey());
+LOG.debug("on ack, no message sequence exists for id: " + 
command.getMessageId() + " and sub: " + command.getSubscriptionKey());
 }
 
 }
@@ -3183,10 +3176,14 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 deletes.add(iterator.next());
 }
 
-long getNextMessageId(int priority) {
+long getNextMessageId() {
 return nextMessageId++;
 }
 
+void revertNextMessageId() {
+nextMessageId--;
+}
+
 MessageKeys get(Transaction tx, Long key) throws IOException {
 MessageKeys result = defaultPriorityIndex.get(tx, key);
 if (result == null) {

buildbot success in ASF Buildbot on activemq-site-production

2015-09-23 Thread buildbot

The Buildbot has detected a restored build on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/2049

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

buildbot failure in ASF Buildbot on activemq-site-production

2015-09-23 Thread buildbot

The Buildbot has detected a new failure on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/2047

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

activemq git commit: https://issues.apache.org/jira/browse/AMQ-5878

2015-09-23 Thread tabish

Repository: activemq
Updated Branches:
  refs/heads/master a74c5d506 -> b2b949791


https://issues.apache.org/jira/browse/AMQ-5878

Update to latest bugfix release of Jackson.

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b2b94979
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b2b94979
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b2b94979

Branch: refs/heads/master
Commit: b2b949791a16f7c43871187cad9778ae0f92d076
Parents: a74c5d5
Author: Timothy Bish 
Authored: Wed Sep 23 13:32:25 2015 -0400
Committer: Timothy Bish 
Committed: Wed Sep 23 13:32:25 2015 -0400

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/b2b94979/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 183c931..2c15be2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
 4.5
 4.4.3
 1.2.0.Beta4
-2.6.1
+2.6.2
 1.9.2
 2.2.11_1
 1.0

Jenkins build is unstable: ActiveMQ-Java7-All-UnitTests #235

2015-09-23 Thread Apache Jenkins Server

See

activemq-cpp git commit: https://issues.apache.org/jira/browse/AMQCPP-585

2015-09-23 Thread tabish

Repository: activemq-cpp
Updated Branches:
  refs/heads/master 78a141774 -> 6ddd619ba


https://issues.apache.org/jira/browse/AMQCPP-585

Fix and test.

Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/6ddd619b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/6ddd619b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/6ddd619b

Branch: refs/heads/master
Commit: 6ddd619bae81215822c7aec3b2469ed6ec894473
Parents: 78a1417
Author: Timothy Bish 
Authored: Wed Sep 23 16:00:11 2015 -0400
Committer: Timothy Bish 
Committed: Wed Sep 23 16:00:11 2015 -0400

--
 activemq-cpp/src/main/decaf/util/Date.cpp | 36 ++--
 activemq-cpp/src/main/decaf/util/Date.h   |  6 ++--
 activemq-cpp/src/test/decaf/util/DateTest.cpp | 39 +++---
 3 files changed, 41 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/6ddd619b/activemq-cpp/src/main/decaf/util/Date.cpp
--
diff --git a/activemq-cpp/src/main/decaf/util/Date.cpp 
b/activemq-cpp/src/main/decaf/util/Date.cpp
index f46ec25..616bba1 100644
--- a/activemq-cpp/src/main/decaf/util/Date.cpp
+++ b/activemq-cpp/src/main/decaf/util/Date.cpp
@@ -29,15 +29,15 @@ using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
 
 

-Date::Date() : time( System::currentTimeMillis() ) {
+Date::Date() : time(System::currentTimeMillis()) {
 }
 
 

-Date::Date( long long milliseconds ) : time(milliseconds) {
+Date::Date(long long milliseconds) : time(milliseconds) {
 }
 
 

-Date::Date( const Date& source ) : time(0) {
+Date::Date(const Date& source) : time(0) {
 (*this) = source;
 }
 
@@ -51,37 +51,37 @@ long long Date::getTime() const{
 }
 
 

-void Date::setTime( long long milliseconds ){
+void Date::setTime(long long milliseconds){
 this->time = milliseconds;
 }
 
 

-bool Date::after( const Date& when ) const {
+bool Date::after(const Date& when) const {
 return time > when.time;
 }
 
 

-bool Date::before( const Date& when ) const {
+bool Date::before(const Date& when) const {
 return time < when.time;
 }
 
 

-Date& Date::operator= ( const Date& source ) {
+Date& Date::operator= (const Date& source) {
 this->time = source.time;
 return *this;
 }
 
 

-bool Date::equals( const Date& when ) const {
+bool Date::equals(const Date& when) const {
 return time == when.time;
 }
 
 

-int Date::compareTo( const Date& value ) const {
+int Date::compareTo(const Date& value) const {
 
-if( this->time < value.time ) {
+if (this->time < value.time) {
 return -1;
-} else if( this->time > value.time ) {
+} else if (this->time > value.time) {
 return 1;
 }
 
@@ -89,32 +89,32 @@ int Date::compareTo( const Date& value ) const {
 }
 
 

-bool Date::operator==( const Date& value ) const {
-return ( this->time == value.time );
+bool Date::operator==(const Date& value) const {
+return (this->time == value.time);
 }
 
 

-bool Date::operator<( const Date& value ) const {
-return ( this->time < value.time );
+bool Date::operator<(const Date& value) const {
+return (this->time < value.time);
 }
 
 

 std::string Date::toString() const {
 
 apr_time_exp_t exploded;
-char buffer[80] = {0};
+char buffer[80] = { 0 };
 apr_size_t resultSize = 0;
 
 // dow mon dd hh:mm:ss zzz 
 static char format[] = "%a %b %d %T %Z %Y";
 
 // Explode time to local time.
-if( apr_time_exp_lt( , this->time ) != APR_SUCCESS ) {
+if (apr_time_exp_lt(, this->time * 1000) != APR_SUCCESS) {
 return "";
 }
 
 // Now format the exploded time into our desired format.
-if( apr_strftime( [0], , sizeof(buffer) / sizeof(char), 
format,