PHOENIX-1764 - Pherf ClassCastException
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6b1818c0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6b1818c0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6b1818c0 Branch: refs/heads/calcite Commit: 6b1818c09233d508105256af311d59d6ab7b06ed Parents: 623829d Author: Cody Marcel <codymar...@apache.org> Authored: Fri Apr 10 16:03:31 2015 -0700 Committer: Cody Marcel <codymar...@apache.org> Committed: Fri Apr 10 16:20:16 2015 -0700 ---------------------------------------------------------------------- phoenix-pherf/cluster/pherf.sh | 2 +- .../org/apache/phoenix/pherf/configuration/XMLConfigParser.java | 2 +- phoenix-pherf/standalone/pherf.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1818c0/phoenix-pherf/cluster/pherf.sh ---------------------------------------------------------------------- diff --git a/phoenix-pherf/cluster/pherf.sh b/phoenix-pherf/cluster/pherf.sh index 5b02fcb..aeff856 100755 --- a/phoenix-pherf/cluster/pherf.sh +++ b/phoenix-pherf/cluster/pherf.sh @@ -28,6 +28,6 @@ for f in $PHERF_HOME/lib/*.jar; do CLASSPATH=${CLASSPATH}:$f; done -CMD=time $JAVA_HOME/bin/java $REMOTE_DEBUG -Dapp.home=$PHERF_HOME $ENV_PROPS -Xms512m -Xmx3072m -cp $CLASSPATH org.apache.phoenix.pherf.Pherf "$@" +CMD="time $}JAVA_HOME}/bin/java ${REMOTE_DEBUG} -Dapp.home=${PHERF_HOME} ${ENV_PROPS} -Xms512m -Xmx3072m -cp ${CLASSPATH} org.apache.phoenix.pherf.Pherf ${@}" eval $CMD \ No newline at end of file http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1818c0/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java index e9255c6..a288e1b 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/configuration/XMLConfigParser.java @@ -65,7 +65,7 @@ public class XMLConfigParser { return scenarios; } - scenarios = (List<Scenario>) Collections.synchronizedCollection(new ArrayList<Scenario>()); + scenarios = Collections.synchronizedList(new ArrayList<Scenario>()); for (Path path : getPaths(getFilePattern())) { try { List<Scenario> scenarioList = XMLConfigParser.readDataModel(path).getScenarios(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1818c0/phoenix-pherf/standalone/pherf.sh ---------------------------------------------------------------------- diff --git a/phoenix-pherf/standalone/pherf.sh b/phoenix-pherf/standalone/pherf.sh index 483830c..e08035a 100755 --- a/phoenix-pherf/standalone/pherf.sh +++ b/phoenix-pherf/standalone/pherf.sh @@ -24,5 +24,5 @@ for f in $PHERF_HOME/lib/*.jar; do CLASSPATH=${CLASSPATH}:$f; done -CMD=time $JAVA_HOME/bin/java $REMOTE_DEBUG -Dapp.home=$PHERF_HOME $ENV_PROPS -Xms512m -Xmx3072m -cp $CLASSPATH org.apache.phoenix.pherf.Pherf "$@" +CMD="time $}JAVA_HOME}/bin/java ${REMOTE_DEBUG} -Dapp.home=${PHERF_HOME} ${ENV_PROPS} -Xms512m -Xmx3072m -cp ${CLASSPATH} org.apache.phoenix.pherf.Pherf ${@}" eval $CMD \ No newline at end of file
