Converted ConcatEval to singleton

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@797238 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 4 deletions

diff --git a/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java b/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
index 12c7fcda0b..22e1b1cb9a 100755
--- a/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
+++ b/src/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
@@ -84,6 +84,7 @@ final class OperationEvaluatorFactory {
 		m.put(LessThanPtg.class, LessThanEval.instance);
 		m.put(NotEqualPtg.class, NotEqualEval.instance);
 
+		m.put(ConcatPtg.class, ConcatEval.instance);
 		m.put(AddPtg.class, AddEval.instance);
 		m.put(DividePtg.class, DivideEval.instance);
 		m.put(MultiplyPtg.class, MultiplyEval.instance);
@@ -112,16 +113,13 @@ final class OperationEvaluatorFactory {
 		if (result != null) {
 			return  result;
 		}
-		
+
 		if (ptgClass == FuncPtg.class) {
 			return new FuncVarEval((FuncPtg)ptg);
 		}
 		if (ptgClass == FuncVarPtg.class) {
 			return new FuncVarEval((FuncVarPtg)ptg);
 		}
-		if (ptgClass == ConcatPtg.class) {
-			return new ConcatEval((ConcatPtg)ptg);
-		}
 		throw new RuntimeException("Unexpected operation ptg class (" + ptgClass.getName() + ")");
 	}
 }