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.

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

ConversionErrorInterceptor to extend MethodFilterIntercept #108

Merged
merged 5 commits into from
Sep 28, 2016
Merged

ConversionErrorInterceptor to extend MethodFilterIntercept #108

merged 5 commits into from
Sep 28, 2016

Conversation

gregh3269
Copy link
Contributor

See WW-4676

Cheers

@lukaszlenart
Copy link
Member

@gregh3269
Copy link
Contributor Author

OK, looks like it needs a doIntercept(..) rather than in Intercept().

On 4 August 2016 at 09:22, Lukasz Lenart notifications@github.com wrote:

Some tests failed
https://builds.apache.org/job/Struts-JDK7-pull-request/209/org.apache.struts$struts2-core/testReport/


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#108 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/ADwEt8Q9RTCp3xIs6DlBp2n5UJfNHMoxks5qcaFMgaJpZM4JcazT
.

@lukaszlenart
Copy link
Member

Still two tests are failing ... I think it would be better to setup excludeMethods/includeMethods in test and callintercept()

@asfgit asfgit merged commit 607fd00 into apache:master Sep 28, 2016
@gregh3269
Copy link
Contributor Author

Revert "WW-4628: proper decoding of parameters in query-string"

Sorry, this was a bad by not really understanding git and git making
automatic commits, it should not have modified any other code. Especially not the revert.

How would this be fixed now?

@cnenning
Copy link
Member

How would this be fixed now?

I fixed it already just by running git cherry-pick. (there is a jira comment about it)

I feared that monstrous issue (WW-4628) would get another round of discussion and was relieved that it was just an accident 😉

@gregh3269
Copy link
Contributor Author

Great thanks!

@lukaszlenart
Copy link
Member

@gregh3269 the best options is to not perform those reverse merges (like b6be359) if there is no conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants