Fix build. Change scripts to use /usr/bin/env so that they work on NiXOS. Revert abort() logic.

This commit is contained in:
Greg Burd 2018-01-16 13:10:12 -05:00
parent 1ef50ae179
commit 1da822ce57
5 changed files with 5 additions and 6 deletions

View file

@ -1,3 +1,3 @@
#!/bin/bash
#!/usr/bin/env bash
mvn clean jar:jar javadoc:jar source:jar deploy -Prelease
mvn clean jar:jar javadoc:jar source:jar deploy -Prelease

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
if [ "X$1" == "Xall" ]; then
for f in $(find ./src -name \*.java); do

View file

@ -1,3 +1,3 @@
#!/bin/bash
#!/usr/bin/env bash
mvn clean jar:jar javadoc:jar source:jar install -Prelease

View file

@ -416,7 +416,7 @@ public abstract class AbstractUnitOfWork<E extends Exception>
/* Explicitly discard the work and mark it as as such in the log. */
public synchronized void abort() {
if (!isDone()) {
if (!aborted) {
aborted = true;
// Spoil any pending futures created within the context of this unit of work.

View file

@ -304,7 +304,6 @@ public final class SessionInitializer extends AbstractSessionOperations {
idempotent,
unitOfWorkClass,
sessionCache,
statementCache,
metricRegistry,
zipkinTracer);
}