[mapguide-commits] r6538 - sandbox/adsk/2.4j/Server/src/Services/Feature

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2012-03-08 23:26:23 -0800 (Thu, 08 Mar 2012)
New Revision: 6538

Modified:
   sandbox/adsk/2.4j/Server/src/Services/Feature/ServerSelectFeatures.cpp
Log:
Submit on behalf of Buddy Hu
Fix ticket https://trac.osgeo.org/mapguide/ticket/1965


Modified: sandbox/adsk/2.4j/Server/src/Services/Feature/ServerSelectFeatures.cpp
===================================================================
--- sandbox/adsk/2.4j/Server/src/Services/Feature/ServerSelectFeatures.cpp	2012-03-09 03:19:33 UTC (rev 6537)
+++ sandbox/adsk/2.4j/Server/src/Services/Feature/ServerSelectFeatures.cpp	2012-03-09 07:26:23 UTC (rev 6538)
@@ -252,12 +252,15 @@
 
                 STRING::size_type nPropLength = propName.length();
                 STRING::size_type nPropStart = expression.rfind(propName);
-                STRING::size_type nPropEnd = expression.find(L")", nPropStart + 1);
+                if(nPropStart != STRING::npos)
+                {
+                    STRING::size_type nPropEnd = expression.find(L")", nPropStart + 1);
 
-                STRING newExpression = expression.substr(0, nPropStart);
-                newExpression += parsedPropertyName;
-                newExpression += expression.substr(nPropStart + nPropLength);
-                computedProperties->SetValue(aliasName, newExpression);
+                    STRING newExpression = expression.substr(0, nPropStart);
+                    newExpression += parsedPropertyName;
+                    newExpression += expression.substr(nPropStart + nPropLength);
+                    computedProperties->SetValue(aliasName, newExpression);
+                }
 
                 // Apply options to FDO command
                 ApplyQueryOptions(isSelectAggregate);


Property changes on: sandbox/adsk/2.4j/Server/src/Services/Feature/ServerSelectFeatures.cpp
___________________________________________________________________
Added: svn:mergeinfo
   + /sandbox/rfc94/Server/src/Services/Feature/ServerSelectFeatures.cpp:5099-5163
/trunk/MgDev/Server/src/Services/Feature/ServerSelectFeatures.cpp:6346,6537