Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid W. Miller2016-09-08 13:15:23 -0400
committerDavid Miller2016-09-09 20:05:07 -0400
commit5a36b4cf784e4340a62febe6e9215d5991dd7ac0 (patch)
treeb77cfe3e3fe2a820ec6b89375d6fa561805b7aed
parent088348f02a40ed9f42817c99acc2a6550e2fa57c (diff)
downloadorg.eclipse.osee-5a36b4cf784e4340a62febe6e9215d5991dd7ac0.tar.gz
org.eclipse.osee-5a36b4cf784e4340a62febe6e9215d5991dd7ac0.tar.xz
org.eclipse.osee-5a36b4cf784e4340a62febe6e9215d5991dd7ac0.zip
bug: Fix deltas on archived branch
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java4
-rw-r--r--plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/LoadDeltasBetweenTxsOnTheSameBranch.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java
index 8895157649..d33d5ef0be 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/Id.java
@@ -40,10 +40,10 @@ public interface Id {
}
default boolean isValid() {
- return !isInvalid();
+ return getId().longValue() > 0;
}
default boolean isInvalid() {
- return getId().equals(SENTINEL);
+ return !isValid();
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/LoadDeltasBetweenTxsOnTheSameBranch.java b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/LoadDeltasBetweenTxsOnTheSameBranch.java
index 6b107328ca..318149225c 100644
--- a/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/LoadDeltasBetweenTxsOnTheSameBranch.java
+++ b/plugins/org.eclipse.osee.orcs.db/src/org/eclipse/osee/orcs/db/internal/change/LoadDeltasBetweenTxsOnTheSameBranch.java
@@ -125,7 +125,7 @@ public class LoadDeltasBetweenTxsOnTheSameBranch extends AbstractDatastoreCallab
}
}
};
- String query = String.format(SELECT_ITEMS_BETWEEN_TRANSACTIONS, isArchived ? "archived" : "");
+ String query = String.format(SELECT_ITEMS_BETWEEN_TRANSACTIONS, isArchived ? "_archived" : "");
getJdbcClient().runQuery(consumer, JdbcConstants.JDBC__MAX_FETCH_SIZE, query, getBranchId(), getStartTx(),
getEndTx());

Back to the top