Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated tomcat versions && fixed some tests #26

Merged
merged 1 commit into from
Jun 14, 2013
Merged

updated tomcat versions && fixed some tests #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/src/main/java/de/javakaffee/web/msm/TranscoderService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ private static byte[] serializeSavedRequest( final Object obj ) {
// -> we omit them here
oos.writeObject(savedRequest.getQueryString());
oos.writeObject(savedRequest.getRequestURI());
oos.writeObject(savedRequest.getDecodedRequestURI());
oos.flush();
return bos.toByteArray();
} catch ( final IOException e ) {
Expand Down Expand Up @@ -424,6 +425,7 @@ private static SavedRequest deserializeSavedRequest( final byte[] data ) {
savedRequest.setMethod((String) ois.readObject());
savedRequest.setQueryString((String) ois.readObject());
savedRequest.setRequestURI((String) ois.readObject());
savedRequest.setDecodedRequestURI((String) ois.readObject());

return savedRequest;
} catch ( final IOException e ) {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tomcat-version>6.0.35</tomcat-version>
<tomcat-version>6.0.37</tomcat-version>
<slf4j-version>1.5.8</slf4j-version>
<hibernate-core-version>3.3.2.GA</hibernate-core-version>
<couchbasemock-version>0.5-69e953bd</couchbasemock-version>
Expand Down
2 changes: 1 addition & 1 deletion tomcat7/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<description>The msm tomcat7 specific implementation.</description>

<properties>
<tomcat-version>7.0.23</tomcat-version>
<tomcat-version>7.0.40</tomcat-version>
</properties>

<dependencies>
Expand Down