Skip to content

Commit cd0eed7

Browse files
committed
trying to fix failing travis build 2
1 parent 9331adf commit cd0eed7

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

pom.xml

+9-3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@
2727
<module>integration-tests</module>
2828
</modules>
2929

30+
<!-- for QR gen tool -->
31+
<repositories>
32+
<repository>
33+
<id>jitpack.io</id>
34+
<url>https://jitpack.io</url>
35+
</repository>
36+
</repositories>
37+
3038
<build>
3139
<plugins>
3240
<plugin>
@@ -36,8 +44,6 @@
3644
<configuration>
3745
<source>1.8</source>
3846
<target>1.8</target>
39-
<!-- this is to avoid travis build failure on old machines with JDK bugs -->
40-
<useIncrementalCompilation>false</useIncrementalCompilation>
4147
</configuration>
4248
</plugin>
4349

@@ -104,7 +110,7 @@
104110
<commons-validator.version>1.5.0</commons-validator.version>
105111
<postgresql.version>9.4.1208</postgresql.version>
106112
<HikariCP.version>2.4.7</HikariCP.version>
107-
<qrgen.version>2.1.0</qrgen.version>
113+
<qrgen.version>2.2.0</qrgen.version>
108114

109115
<!-- test versions -->
110116
<commons-lang3.version>3.4</commons-lang3.version>

server/http-api/src/main/java/cc/blynk/server/api/http/logic/HttpAPILogic.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
import javax.ws.rs.*;
4141
import javax.ws.rs.core.MediaType;
42-
import java.io.IOException;
4342
import java.util.Base64;
4443

4544
import static cc.blynk.core.http.Response.*;
@@ -228,8 +227,8 @@ public Response updateWidgetPinData(@PathParam("token") String token) {
228227
String qrData = "bp1" + Base64.getEncoder().encodeToString(compressed);
229228
byte[] qrDataBinary = QRCode.from(qrData).to(ImageType.PNG).withSize(500, 500).stream().toByteArray();
230229
return ok(qrDataBinary, "image/png");
231-
} catch (IOException ioe) {
232-
log.error("Error generating QR.", ioe);
230+
} catch (Exception e) {
231+
log.error("Error generating QR. Reason : {}", e.getMessage());
233232
return Response.badRequest("Error generating QR.");
234233
}
235234
}

0 commit comments

Comments
 (0)