Skip to content

Commit 7ba7178

Browse files
committed
cleaned up IconServlet
1 parent 18d3750 commit 7ba7178

2 files changed

Lines changed: 5 additions & 18 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>de.unirostock.sems</groupId>
3939
<artifactId>CombineExt</artifactId>
40-
<version>0.3.4</version>
40+
<version>1.0.2</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>de.binfalse</groupId>

src/main/java/de/unirostock/sems/cbarchive/web/servlet/IconServlet.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import java.io.IOException;
2121
import java.io.InputStream;
2222
import java.io.OutputStream;
23-
import java.io.OutputStreamWriter;
2423
import java.io.UnsupportedEncodingException;
2524
import java.net.URI;
2625
import java.net.URISyntaxException;
@@ -50,10 +49,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
5049

5150
if( requestUrl != null && !requestUrl.isEmpty() ) {
5251

52+
String formatString = null;
5353
try {
5454
response.setContentType( "image/png" );
5555

56-
String formatString = requestUrl.substring( requestUrl.indexOf("res/icon/") + 9 );
56+
formatString = requestUrl.substring( requestUrl.indexOf("res/icon/") + 9 );
5757
LOGGER.debug("format: ", formatString);
5858

5959
URI format = new URI( formatString );
@@ -71,24 +71,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
7171
response.flushBuffer();
7272

7373
} catch (IOException e) {
74-
// TODO Auto-generated catch block
75-
e.printStackTrace();
74+
LOGGER.error(e, "IOException while loading icon");
7675
} catch (URISyntaxException e) {
77-
// TODO Auto-generated catch block
78-
e.printStackTrace();
76+
LOGGER.warn(e, "Not able to generate URL for Iconizer: ", formatString);
7977
}
8078

81-
82-
}
83-
84-
try {
85-
OutputStream output = response.getOutputStream();
86-
new OutputStreamWriter(output).append("Hello World");
87-
output.close();
88-
response.flushBuffer();
89-
} catch (IOException e) {
90-
// TODO Auto-generated catch block
91-
e.printStackTrace();
9279
}
9380

9481
}

0 commit comments

Comments
 (0)