address null

usdot-fhwa-stol · May 9, 2024 · 57a2763 · 57a2763
1 parent 6277c0b
commit 57a2763
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/cc/ws/CtrlTiles.java b/src/cc/ws/CtrlTiles.java
@@ -158,7 +158,8 @@ public void init(ServletConfig oConfig)
 	protected void doGet(HttpServletRequest oRequest, HttpServletResponse oResponse)
 	   throws ServletException, IOException
 	{
-		TimeSource timeSrc = (TimeSource) this.getServletContext().getAttribute(TimeSource.class.getName());
+		Object timeObj = this.getServletContext().getAttribute(TimeSource.class.getName());
+		TimeSource timeSrc = timeObj != null? (TimeSource) timeObj: new TimeSource(false);
 		long lNow = timeSrc.currentTimeMillis();
 		String[] sUriParts = oRequest.getRequestURI().split("/");
 		int nZ = Integer.parseInt(sUriParts[sUriParts.length - 3]);
@@ -450,7 +451,8 @@ private void addControl(HttpServletRequest oReq, HttpServletResponse oRes)
 	{
 		try
 		{
-			TimeSource timeSrc = (TimeSource) this.getServletContext().getAttribute(TimeSource.class.getName());
+			Object timeObj = this.getServletContext().getAttribute(TimeSource.class.getName());
+			TimeSource timeSrc = timeObj != null? (TimeSource) timeObj: new TimeSource(false);
 			long lNow = timeSrc.currentTimeMillis();
 			int nType = Integer.parseInt(oReq.getParameter("type"));
 			String[] sVtypes = oReq.getParameterValues("vtypes[]");
@@ -563,7 +565,8 @@ private void saveEdit(HttpServletRequest oReq, HttpServletResponse oRes)
 	{
 		try
 		{
-			TimeSource timeSrc = (TimeSource) this.getServletContext().getAttribute(TimeSource.class.getName());
+			Object timeObj = this.getServletContext().getAttribute(TimeSource.class.getName());
+			TimeSource timeSrc = timeObj != null? (TimeSource) timeObj: new TimeSource(false);
 			long lNow = timeSrc.currentTimeMillis();
 			int nType = Integer.parseInt(oReq.getParameter("type"));
 			String[] sVtypes = oReq.getParameterValues("vtypes[]");

diff --git a/src/cc/ws/TcmReqServlet.java b/src/cc/ws/TcmReqServlet.java
@@ -109,7 +109,8 @@ public void run()
 	{
 		try
 		{
-			TimeSource timeSrc = (TimeSource) this.getServletContext().getAttribute(TimeSource.class.getName());
+			Object timeObj = this.getServletContext().getAttribute(TimeSource.class.getName());
+			TimeSource timeSrc = timeObj != null? (TimeSource) timeObj: new TimeSource(false);
 			long lNow = timeSrc.currentTimeMillis();
 			String sReq = Thread.currentThread().getName();
 			int nPos = sReq.indexOf('<');