cziegeler 2002/11/16 13:01:54
Modified: src/blocks/portal-fw/samples/resources roleprofile.xml
src/java/org/apache/cocoon/components/source/impl
SitemapSource.java
src/java/org/apache/cocoon/components
CocoonComponentManager.java
Log:
Updating bug fix
Revision Changes Path
1.2 +1 -1
xml-cocoon2/src/blocks/portal-fw/samples/resources/roleprofile.xml
Index: roleprofile.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/portal-fw/samples/resources/roleprofile.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- roleprofile.xml 27 Sep 2002 12:11:15 -0000 1.1
+++ roleprofile.xml 16 Nov 2002 21:01:54 -0000 1.2
@@ -5,6 +5,6 @@
<roledelta xmlns:session="http://cocoon.apache.org/session/1.0";
xmlns:cinclude="http://apache.org/cocoon/include/1.0";>
<cinclude:includexml ignoreErrors="true">
- <cinclude:src>profiles/roleprofile-<session:getxml context="request"
path="/parameter/role"/>.xml</cinclude:src>
+ <cinclude:src>profiles/roleprofile-<session:getxml context="request"
path="/parameter/role"/>.xml</cinclude:src>
</cinclude:includexml>
</roledelta>
1.21 +10 -10
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SitemapSource.java 15 Nov 2002 13:31:36 -0000 1.20
+++ SitemapSource.java 16 Nov 2002 21:01:54 -0000 1.21
@@ -359,17 +359,17 @@
throw this.exception;
}
try {
- XMLConsumer consumer;
- if (contentHandler instanceof XMLConsumer) {
- consumer = (XMLConsumer)contentHandler;
- } else if (contentHandler instanceof LexicalHandler) {
- consumer = new ContentHandlerWrapper(contentHandler,
(LexicalHandler)contentHandler);
- } else {
- consumer = new ContentHandlerWrapper(contentHandler);
- }
if (this.redirectSource != null) {
- this.environment.toSAX(this.redirectSource, consumer);
+ this.environment.toSAX(this.redirectSource, contentHandler);
} else {
+ XMLConsumer consumer;
+ if (contentHandler instanceof XMLConsumer) {
+ consumer = (XMLConsumer)contentHandler;
+ } else if (contentHandler instanceof LexicalHandler) {
+ consumer = new ContentHandlerWrapper(contentHandler,
(LexicalHandler)contentHandler);
+ } else {
+ consumer = new ContentHandlerWrapper(contentHandler);
+ }
// We have to buffer the result in order to get
// clean environment stack handling.
XMLSerializer xmls = (XMLSerializer)
this.manager.lookup(XMLSerializer.ROLE);
1.36 +8 -2
xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/CocoonComponentManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- CocoonComponentManager.java 16 Nov 2002 17:14:46 -0000 1.35
+++ CocoonComponentManager.java 16 Nov 2002 21:01:54 -0000 1.36
@@ -168,7 +168,13 @@
processList.set(processes);
}
EnvironmentDescription desc = new EnvironmentDescription(env);
- Long key = new Long(System.currentTimeMillis());
+ Object key = new Long(System.currentTimeMillis());
+ // unique test (this is currently a sanity check
+ // perhaps it's not needed - if it's needed we
+ // have to improve it for performance
+ while (processes.containsKey(key)) {
+ key = "A" + key;
+ }
processes.put(key, desc);
env.getObjectModel().put(PROCESS_KEY, key);
return key;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
