Merge pull request stewartfrancis#2 from hobbit1983/master

Purge the queue
ledina · Oct 16, 2019 · e6a69a6 · e6a69a6
2 parents 7f5b427 + 64b5850
commit e6a69a6
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/explorer/demo-explorer-bundle/META-INF/cics.xml b/explorer/demo-explorer-bundle/META-INF/cics.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <manifest xmlns="http://www.ibm.com/xmlns/prod/cics/bundle" id="demo-explorer-bundle" bundleMajorVer="0" bundleMinorVer="0" bundleMicroVer="1" bundleVersion="1" bundleRelease="0" build="IntB-201809142129">
     <meta_directives>
-        <timestamp>2019-10-14T02:05:48.841+01:00</timestamp>
+        <timestamp>2019-10-15T10:12:42.091+02:00</timestamp>
     </meta_directives>
     <define name="demo-explorer-war" type="http://www.ibm.com/xmlns/prod/cics/bundle/WARBUNDLE" path="demo-explorer-war.warbundle"/>
 </manifest>
diff --git a/explorer/demo-explorer-war/src/demo/SimpleServletFilter.java b/explorer/demo-explorer-war/src/demo/SimpleServletFilter.java
@@ -32,6 +32,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 		tsq = new TSQ();
 		tsq.setName(SimpleServlet.TSQ_NAME);
 		tsq.setType(TSQType.MAIN);
+		purgeQueue(tsq);
 
 		Faker faker = new Faker();
 
@@ -61,7 +62,16 @@ public void destroy() {
 		try {
 			tsq.delete();
 		} catch (CicsConditionException e) {
-			throw new RuntimeException(e);
+			//throw new RuntimeException(e);
+		}
+	}
+
+	private void purgeQueue(TSQ tsq){
+		try{
+			tsq.delete();
+		}catch(CicsConditionException cce){
+			//purging the queue will fail if the queue doesn't exist
+			//so ignore this exception
 		}
 	}
 

diff --git a/maven/demo-war/src/main/java/demo/SimpleServletFilter.java b/maven/demo-war/src/main/java/demo/SimpleServletFilter.java
@@ -32,6 +32,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 		tsq = new TSQ();
 		tsq.setName(SimpleServlet.TSQ_NAME);
 		tsq.setType(TSQType.MAIN);
+		this.purgeQueue(tsq);
 
 		Faker faker = new Faker();
 
@@ -61,7 +62,16 @@ public void destroy() {
 		try {
 			tsq.delete();
 		} catch (CicsConditionException e) {
-			throw new RuntimeException(e);
+			//throw new RuntimeException(e);
+		}
+	}
+
+	private void purgeQueue(TSQ tsq){
+		try{
+			tsq.delete();
+		}catch(CicsConditionException cce){
+			//purging the queue will fail if the queue doesn't exist
+			//so ignore this exception
 		}
 	}