diff options
| author | donald.g.dunne | 2014-06-16 18:47:22 +0000 |
|---|---|---|
| committer | donald.g.dunne | 2014-06-17 04:22:01 +0000 |
| commit | 33553f2a403fe872b42ab6b65c37ca060e793454 (patch) | |
| tree | a08a78f28afbf3e9a598287a3010b043c3155a51 /plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee | |
| parent | fbecd4aec5c8c4fcfe9f4bc51eb7ad93729895c1 (diff) | |
| download | org.eclipse.osee-33553f2a403fe872b42ab6b65c37ca060e793454.tar.gz org.eclipse.osee-33553f2a403fe872b42ab6b65c37ca060e793454.tar.xz org.eclipse.osee-33553f2a403fe872b42ab6b65c37ca060e793454.zip | |
feature[ats_ATS19845]: Fix server decoding merge branch update message
Change-Id: Id5a093873fd97e71aaa74af5e9a5dc1a56883d58
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee')
| -rw-r--r-- | plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java index ae6860cdc8b..53c0d9f9731 100644 --- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java +++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/BranchRow.java @@ -167,6 +167,8 @@ public final class BranchRow { if (longId == null) { if (branchGuid.equals("-1")) { longId = -1L; + } else if (branchGuid.matches("\\d+")) { + longId = Long.valueOf(branchGuid); } else { longId = DatabaseService.getDatabaseService().runPreparedQueryFetchObject(0L, SELECT_BRANCH_ID_BY_GUID, |