You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/04/14 01:45:53 UTC
svn commit: r933817 - in /myfaces/shared/trunk_4.0.x: ./
core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
Author: lu4242
Date: Tue Apr 13 23:45:52 2010
New Revision: 933817
URL: http://svn.apache.org/viewvc?rev=933817&view=rev
Log:
merge revisions 881094 to 924402 including MYFACES-2290
Modified:
myfaces/shared/trunk_4.0.x/ (props changed)
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
Propchange: myfaces/shared/trunk_4.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 13 23:45:52 2010
@@ -1 +1 @@
-/myfaces/shared/trunk_3.0.x:805066-833809
+/myfaces/shared/trunk_3.0.x:805066-833809,881094-924402
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java?rev=933817&r1=933816&r2=933817&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/webapp/webxml/WebXmlParser.java Tue Apr 13 23:45:52 2010
@@ -153,6 +153,10 @@ public class WebXmlParser
InputStream inStream = ClassUtils.getContextClassLoader().getResourceAsStream(systemId);
if (inStream == null)
{
+ inStream = this.getClass().getClassLoader().getResourceAsStream(systemId);
+ }
+ if (inStream == null)
+ {
// there is no such entity
return null;
}