Skip to content

Commit ee7f8bf

Browse files
greenlaw110greenlaw110
committed
1 parent e41e561 commit ee7f8bf

6 files changed

Lines changed: 16 additions & 12 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# ActFramework Change Log
22

33
**1.8.8**
4-
* update osgl-tool to 1.11.2
4+
* Clean up extra error logs #661
5+
* A weird `ClassCastException` #660
6+
* update osgl-tool to 1.11.3
57
* Add helper methods to `LogSupport` for line printing #659
68
* Allow set delay time for `@OnAppStart` and `@AlongWith` #658
79
* `echo` handler shall set `Content-Type` header #650

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Add `act-starter-parent` into into your pom.xml file
1515
<parent>
1616
<groupId>org.actframework</groupId>
1717
<artifactId>act-starter-parent</artifactId>
18-
<version>1.8.8.0-RC2</version>
18+
<version>1.8.8.0-RC3</version>
1919
</parent>
2020
```
2121

@@ -27,7 +27,7 @@ mvn archetype:generate -B \
2727
-DartifactId=helloworld \
2828
-DarchetypeGroupId=org.actframework \
2929
-DarchetypeArtifactId=archetype-quickstart \
30-
-DarchetypeVersion=1.8.8.0-RC2
30+
-DarchetypeVersion=1.8.8.0-RC3
3131
```
3232

3333
To start an new project for RESTful service:
@@ -38,19 +38,19 @@ mvn archetype:generate -B \
3838
-DartifactId=helloworld \
3939
-DarchetypeGroupId=org.actframework \
4040
-DarchetypeArtifactId=archetype-simple-restful-service \
41-
-DarchetypeVersion=1.8.8.0-RC2
41+
-DarchetypeVersion=1.8.8.0-RC3
4242
```
4343

4444
**tips** don't forget replace the `groupId`, `artifactId` and `appName` in the above script, or you can use interactive mode to generate your project:
4545

4646
```
47-
mvn archetype:generate -DarchetypeGroupId=org.actframework -DarchetypeArtifactId=archetype-quickstart -DarchetypeVersion=1.8.8.0-RC2
47+
mvn archetype:generate -DarchetypeGroupId=org.actframework -DarchetypeArtifactId=archetype-quickstart -DarchetypeVersion=1.8.8.0-RC3
4848
```
4949

5050
Or
5151

5252
```
53-
mvn archetype:generate -DarchetypeGroupId=org.actframework -DarchetypeArtifactId=archetype-simple-restful-service -DarchetypeVersion=1.8.8.0-RC2
53+
mvn archetype:generate -DarchetypeGroupId=org.actframework -DarchetypeArtifactId=archetype-simple-restful-service -DarchetypeVersion=1.8.8.0-RC3
5454
```
5555

5656
For RESTful service project

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
<jpa.version>1.0.0.Final</jpa.version>
6363
<joda-time.version>2.9.9</joda-time.version>
6464
<okhttp.version>3.10.0</okhttp.version>
65-
<osgl-tool.version>1.11.2</osgl-tool.version>
65+
<osgl-tool.version>1.11.3</osgl-tool.version>
6666
<osgl-cache.version>1.3.3</osgl-cache.version>
6767
<osgl-genie.version>1.7.1</osgl-genie.version>
6868
<osgl-http.version>1.6.0</osgl-http.version>
69-
<osgl-mvc.version>1.6.0</osgl-mvc.version>
69+
<osgl-mvc.version>1.6.1</osgl-mvc.version>
7070
<osgl-storage.version>1.5.3</osgl-storage.version>
7171
<osgl-tool-ext.version>1.1.3</osgl-tool-ext.version>
7272
<osgl-ut.version>2.0.0-BETA-1</osgl-ut.version>

‎src/main/java/act/xio/NetworkHandler.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,10 @@ public void run() {
177177

178178
ctx.prepareRespForWrite().addHeaderIfNotAdded(H.Header.Names.CONTENT_TYPE, fmt.contentType());
179179
r.apply(req, ctx.prepareRespForWrite());
180+
} catch (IllegalStateException e) {
181+
if (!S.is(e.getMessage()).contains("UT000002: The response has already been started")) {
182+
handleException(e, ctx, "Error handling network request");
183+
}
180184
} catch (Exception e) {
181185
handleException(e, ctx, "Error handling network request");
182186
} finally {

‎testapp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<properties>
7474
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7575
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
76-
<act.version>1.8.8-SNAPSHOT</act.version>
76+
<act.version>1.8.8-RC3-SNAPSHOT</act.version>
7777
<act.storage.version>[0.13.0, 2.0.0)</act.storage.version>
7878
<act.morphia.version>1.4.1</act.morphia.version>
7979
<app.entry>testapp.TestApp</app.entry>

‎testapp/src/test/java/testapp/endpoint/GHIssue657.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ public class GHIssue657 extends EndpointTester {
66

77
@Test
88
public void testList1() throws Exception {
9-
url("/gh/657/1").get();
10-
String s = resp().body().string();
11-
System.out.println(s);
9+
url("/gh/657/1").header("accept", "application/json").get();
1210
bodyContains("2018");
1311
}
1412

0 commit comments

Comments
 (0)