Merge remote-tracking branch 'origin/master' into develop

cytoscape · Dec 7, 2017 · b934826 · b934826
2 parents 524a1b5 + 7e7b8b4
commit b934826
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
 
 		<rest.api.version>v1</rest.api.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<cytoscape.api.version>[3.6.0,3.7.0)</cytoscape.api.version>
+		<cytoscape.api.version>3.6.0</cytoscape.api.version>
 	</properties>
 
 	<groupId>org.cytoscape</groupId>

diff --git a/src/main/java/org/cytoscape/rest/internal/resource/NetworkViewResource.java b/src/main/java/org/cytoscape/rest/internal/resource/NetworkViewResource.java
@@ -449,9 +449,19 @@ private Response getImageForView(String fileType, Long networkId, Long viewId, I
 
 	private final Response imageGenerator(final String fileType, PresentationWriterFactory factory, 
 			final CyNetworkView view, int width, int height) {
-		final Collection<RenderingEngine<?>> re = renderingEngineManager.getRenderingEngines(view);
+		Collection<RenderingEngine<?>> re = renderingEngineManager.getRenderingEngines(view);
+		try {
+		for (int retry = 0; re.isEmpty() && retry < 20; retry++) {
+			System.out.println("No renderer available. Retry count: " + retry);
+			Thread.sleep(100);
+			re = renderingEngineManager.getRenderingEngines(view);
+		}
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
 		if (re.isEmpty()) {
-			throw new IllegalArgumentException("No rendering engine.");
+			throw new IllegalArgumentException("No rendering engine for {\"network\":" + view.getModel().getSUID() +", \"view\":" + view.getSUID() + "}");
 		}
 		try {
 			RenderingEngine<?> engine = null;