dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #48 from nbaars/master

Browse Source 
Null Pointer Exception on every page #47
This commit is contained in:
Nanne 2015-08-25 00:48:36 +02:00
commit cc9ae0a6a9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webgoat-container/src/main/java/org/owasp/webgoat/util/LabelManagerImpl.java
View File

@ -5,7 +5,7 @@ import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.inject.Inject; import javax.annotation.Resource;
import java.io.Serializable; import java.io.Serializable;
import java.util.Locale; import java.util.Locale;
@ -41,6 +41,7 @@ import java.util.Locale;
@Scope(value="session", proxyMode=ScopedProxyMode.INTERFACES) @Scope(value="session", proxyMode=ScopedProxyMode.INTERFACES)
public class LabelManagerImpl implements LabelManager, Serializable public class LabelManagerImpl implements LabelManager, Serializable
{ {
@Resource
private transient LabelProvider labelProvider; private transient LabelProvider labelProvider;
/** Locale mapped with current session. */ /** Locale mapped with current session. */
@ -48,8 +49,7 @@ public class LabelManagerImpl implements LabelManager, Serializable
protected LabelManagerImpl() {} protected LabelManagerImpl() {}
@Inject protected LabelManagerImpl(LabelProvider labelProvider) {
public LabelManagerImpl(LabelProvider labelProvider) {
this.labelProvider = labelProvider; this.labelProvider = labelProvider;
} }