From 5129fee3e683eb53cfeb1a8091becfd009bc5245 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Tue, 17 Jun 2014 14:52:27 -0500 Subject: [PATCH] Omaha #3245 fix GFE starting without a cave data Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7 Former-commit-id: 2ce0e5aee5c892dc786fd0f5f72caee700a9fd3f [formerly 19aa9dc96e0e9245e01287b31af1a369ad38f859] [formerly 8ab7d86a8f646b20e57c23a81ef4d4c3c37e5b94 [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]] Former-commit-id: 8ab7d86a8f646b20e57c23a81ef4d4c3c37e5b94 Former-commit-id: 451b265ce689033104618605fc4bac69df7bc5f8 --- cave/build/static/linux/cave/cave.sh | 7 ++----- edexOsgi/com.raytheon.uf.tools.cli/impl/capture | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cave/build/static/linux/cave/cave.sh b/cave/build/static/linux/cave/cave.sh index b3cce3d4c8..2b09b4c8f0 100644 --- a/cave/build/static/linux/cave/cave.sh +++ b/cave/build/static/linux/cave/cave.sh @@ -233,11 +233,8 @@ curTime=`date +%Y%m%d_%H%M%S` shift done - # Special instructions for the 64-bit jvm. - ARCH_ARGS="" - if [ -f /awips2/java/jre/lib/amd64/server/libjvm.so ]; then - ARCH_ARGS="-vm /awips2/java/jre/lib/amd64/server/libjvm.so" - fi + # Eclipse recommends explicitly setting the JVM to use + ARCH_ARGS="-vm /awips2/java/bin/java" lookupINI "${USER_ARGS[@]}" diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/capture b/edexOsgi/com.raytheon.uf.tools.cli/impl/capture index cc6d40b108..cc8adc2f0d 100644 --- a/edexOsgi/com.raytheon.uf.tools.cli/impl/capture +++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/capture @@ -51,7 +51,7 @@ usage() { echo " The servers to grab top information from, make sure list is quoted and space delimited" echo echo -e "-d {y/n}\t\tdefault [$RUN_JMAP]" - echo " Run jmap to grab the head dump information" + echo " Run jmap to grab the heap dump information" echo echo -e "-e {request/ingest/ingestGrib/ingestDat}" echo " Run edex mode and grab information about the jvm passed. May be used multiple times to grab data about multiple jvms"