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

Merge branch 'omaha_14.3.1' into omaha_14.4.1

Browse source 
Conflicts:
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LockingFileOutputStream.java (moved to ufcore)

Former-commit-id: c6aa4b6cbd [formerly d9a3129339] [formerly 23d0cf81f8 [formerly 11c37fed7aed29ee42661948db90fab14b49c93c]]
Former-commit-id: 23d0cf81f8
Former-commit-id: f6f5c5a395
This commit is contained in:
Steve Harris 2014-06-25 07:11:58 -05:00
commit 5a5b95e88e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.d2d.xy.adapters/src/com/raytheon/uf/viz/d2d/xy/adapters/timeseries/GridTimeSeriesAdapter.java
View file

@ -324,8 +324,9 @@ public class GridTimeSeriesAdapter extends
dataPoint = new XYData(time, value);
}
}
data.add(dataPoint);
if (dataPoint != null){
data.add(dataPoint);
}
}
XYDataList list = new XYDataList();