Skip to content

Commit e3a4fb8

Browse files
committed
Merge pull request #907 from caelum/issue_906
removing result.used from forwardTo
2 parents dce4bfc + b630089 commit e3a4fb8

File tree

3 files changed

+4
-15
lines changed

3 files changed

+4
-15
lines changed

vraptor-core/src/main/java/br/com/caelum/vraptor/core/DefaultResult.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package br.com.caelum.vraptor.core;
1919

2020

21-
import static br.com.caelum.vraptor.view.Results.logic;
2221
import static java.util.Collections.unmodifiableMap;
2322

2423
import java.util.HashMap;
@@ -83,12 +82,6 @@ public <T extends View> T use(Class<T> view) {
8382
return container.instanceFor(view);
8483
}
8584

86-
@Override
87-
public <T> T forwardTo(Class<T> controller) {
88-
messages.assertAbsenceOfErrors();
89-
return container.instanceFor(logic()).forwardTo(controller);
90-
}
91-
9285
@Override
9386
public Result on(Class<? extends Exception> exception) {
9487
return exceptions.record(exception);

vraptor-core/src/main/java/br/com/caelum/vraptor/view/DefaultLogicResult.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.slf4j.LoggerFactory;
3535

3636
import br.com.caelum.vraptor.Get;
37-
import br.com.caelum.vraptor.Result;
3837
import br.com.caelum.vraptor.controller.ControllerMethod;
3938
import br.com.caelum.vraptor.controller.DefaultControllerMethod;
4039
import br.com.caelum.vraptor.controller.HttpMethod;
@@ -68,20 +67,18 @@ public class DefaultLogicResult implements LogicResult {
6867
private final TypeNameExtractor extractor;
6968
private final FlashScope flash;
7069
private final MethodInfo methodInfo;
71-
private final Result result;
7270

7371
/**
7472
* @deprecated CDI eyes only
7573
*/
7674
protected DefaultLogicResult() {
77-
this(null, null, null, null, null, null, null, null, null, null);
75+
this(null, null, null, null, null, null, null, null, null);
7876
}
7977

8078
@Inject
8179
public DefaultLogicResult(Proxifier proxifier, Router router, MutableRequest request, HttpServletResponse response,
82-
Container container, PathResolver resolver, TypeNameExtractor extractor, FlashScope flash, MethodInfo methodInfo, Result result) {
80+
Container container, PathResolver resolver, TypeNameExtractor extractor, FlashScope flash, MethodInfo methodInfo) {
8381
this.proxifier = proxifier;
84-
this.result = result;
8582
this.response = unproxifyIfPossible(response);
8683
this.request = unproxifyIfPossible(request);
8784
this.router = router;
@@ -115,7 +112,7 @@ public Object intercept(T proxy, Method method, Object[] args, SuperMethod super
115112
request.setAttribute(extractor.nameFor(returnType), methodResult);
116113
}
117114

118-
if (response.isCommitted() || result.used()) {
115+
if (response.isCommitted()) {
119116
logger.debug("Response already commited, not forwarding.");
120117
return null;
121118
}

vraptor-core/src/test/java/br/com/caelum/vraptor/view/DefaultLogicResultTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public class DefaultLogicResultTest {
7777
private @Mock TypeNameExtractor extractor;
7878
private @Mock RequestDispatcher dispatcher;
7979
private @Mock FlashScope flash;
80-
private @Mock Result result;
8180

8281
private Proxifier proxifier;
8382

@@ -121,7 +120,7 @@ public void setup() {
121120
proxifier = new JavassistProxifier();
122121
methodInfo = new MethodInfo(new ParanamerNameProvider());
123122
this.logicResult = new DefaultLogicResult(proxifier, router, request, response, container,
124-
resolver, extractor, flash, methodInfo, result);
123+
resolver, extractor, flash, methodInfo);
125124
}
126125

127126
@Test

0 commit comments

Comments
 (0)