xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master_14.2.2' (14.2.2-8) into omaha_14.2.2

Browse source 
Former-commit-id: f5bc8e598b [formerly a2f35d52b5ffbf2fee8bd953eb795810972e4e53]
Former-commit-id: 2247a499c4
This commit is contained in:
Steve Harris 2014-05-13 15:32:39 -05:00
commit bef1d9681c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
View file

@ -85,8 +85,8 @@ import com.vividsolutions.jts.io.WKTWriter;
* 03/01/13 DR 13228 G. Zhang Add state for VGB query and related code
* 03/18/13 1817 D. Hladky Fixed issue with BOX where only 1 HUC was showing up.
* 08/20/13 2250 mnash Fixed incorrect return types for database queries.
* 09/05/14 DR 17346 G. Zhang Fixed issue with DB return types.
* </pre>
*
* @author dhladky
* @version 1
*/
@ -254,7 +254,7 @@ public class FFMPUtils {
if (results.length > 0) {
for (int i = 0; i < results.length; i++) {
String column_name = (String) ((Object[]) results[i])[0];
String column_name = (String) results[i]/*((Object[]) results[i])[0]*/;
if (column_name.startsWith("upstream")) {
upstreams.add("upstream" + j);
j++;
@ -601,7 +601,7 @@ public class FFMPUtils {
for (int i = 0; i < results.length; i++) {
if (results[i] != null) {
keys.add(new Integer(
(String) ((Object[]) results[i])[0])
(String)results[i]/* ((Object[]) results[i])[0]*/)
.longValue());
}
}