Attached is the diff.
Dies Koper wrote:
> Hi Justin,
>
> I was curious about what you fixed to make it work, but I did not find
> it on the CVS mailing list:
>
> https://glassfish.dev.java.net/servlets/BrowseList?listName=cvs&by=date&from=2009-08-01&to=2009-08-31&first=1&count=41
>
>
> I believe the CVS mailing list is linked to the v2.1.1 repository.
> Where did you commit your fix to?
>
> Thanks,
> Dies
>
> Justin Lee wrote:
>> I believe so, yes.
>> Shreedhar Ganapathy wrote:
>>> Hi Justin
>>> That's great news. That would be v2.1.1, correct ?
>>> On v2u2 and v2.1 we still have to recommend using JDK 5 unless users
>>> are willing to move up to the next v2.1.1 promoted build.
>>>
>>> --Shreedhar
>>>
>>> Justin Lee wrote:
>>>> I actually committed a fix yesterday that fixes GFv2 on AIX with
>>>> IBM JDK 6 so hopefully the next promoted build should have it.
>>>>
>>>> Shreedhar Ganapathy wrote:
>>>>> One thought. On AIX, check if you are running with IBM JDK 6. That
>>>>> is not supported with GF v2 u2 or GF v2.1
>>>>> Use IBM JDK 5.
>>>>>
>>>>>
>>>>>
>>>>> glassfish_at_javadesktop.org wrote:
>>>>>> Have you solved it? How to do?
>>>>>> I meet the same problem. Waiting for your reply.
>>>>>> [Message sent by forum member 'vitalwang' (vitalwang)]
>>>>>>
>>>>>> http://forums.java.net/jive/thread.jspa?messageID=359369
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: users-help_at_glassfish.dev.java.net
>
Index: ./src/java/com/sun/enterprise/server/logging/BaseLogManager.java
===================================================================
RCS file: /cvs/glassfish/appserv-core/src/java/com/sun/enterprise/server/logging/BaseLogManager.java,v
retrieving revision 1.2
retrieving revision 1.7.6.1
diff -r1.2 -r1.7.6.1
2,5c2
< * The contents of this file are subject to the terms
< * of the Common Development and Distribution License
< * (the "License"). You may not use this file except
< * in compliance with the License.
---
> * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
7,11c4
< * You can obtain a copy of the license at
< * glassfish/bootstrap/legal/CDDLv1.0.txt or
< * https://glassfish.dev.java.net/public/CDDLv1.0.html.
< * See the License for the specific language governing
< * permissions and limitations under the License.
---
> * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
13,19c6,34
< * When distributing Covered Code, include this CDDL
< * HEADER in each file and include the License file at
< * glassfish/bootstrap/legal/CDDLv1.0.txt. If applicable,
< * add the following below this CDDL HEADER, with the
< * fields enclosed by brackets "[]" replaced with your
< * own identifying information: Portions Copyright [yyyy]
< * [name of copyright owner]
---
> * The contents of this file are subject to the terms of either the GNU
> * General Public License Version 2 only ("GPL") or the Common Development
> * and Distribution License("CDDL") (collectively, the "License"). You
> * may not use this file except in compliance with the License. You can obtain
> * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
> * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
> * language governing permissions and limitations under the License.
> *
> * When distributing the software, include this License Header Notice in each
> * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
> * Sun designates this particular file as subject to the "Classpath" exception
> * as provided by Sun in the GPL Version 2 section of the License file that
> * accompanied this code. If applicable, add the following below the License
> * Header, with the fields enclosed by brackets [] replaced by your own
> * identifying information: "Portions Copyrighted [year]
> * [name of copyright owner]"
> *
> * Contributor(s):
> *
> * If you wish your version of this file to be governed by only the CDDL or
> * only the GPL Version 2, indicate your decision by adding "[Contributor]
> * elects to include this software in this distribution under the [CDDL or GPL
> * Version 2] license." If you don't indicate a single choice of license, a
> * recipient has the option to distribute your version of this file under
> * either the CDDL, the GPL Version 2 or to extend the choice of license to
> * its licensees as provided above. However, if you add GPL Version 2 code
> * and therefore, elected the GPL Version 2 license, then the option applies
> * only if the new code is made subject to such option by the copyright
> * holder.
61a77,78
> private Boolean mogLoggerCreated = false;
>
127,135c144,153
< // We subclass readConfiguration to keep track of whether the configuration
< // has been read. There are multiple readConfiguration methods, but all result
< // in this one being invoked. As soon as the configuration is read, we
< // go back an reinitialize any loggers whose initialization was deferred
< // prior to the configuration being read.
< public void readConfiguration(InputStream ins)
< throws IOException, SecurityException
< {
< super.readConfiguration(ins);
---
> /**
> * Overridden to work around a bug in IBM's/harmony's java6 implementation.
> * See https://issues.apache.org/jira/browse/HARMONY-6298
> *
> * @throws IOException
> * @throws SecurityException
> */
> @Override
> public void readConfiguration() throws IOException, SecurityException {
> super.readConfiguration();
151a170,174
> String modLoggerName = ModuleToLoggerNameMapper.getMatchedModuleLoggerName(logger.getName());
> if (modLoggerName !=null && !modLoggerName.equals(logger.getName())) {
> Logger.getLogger(modLoggerName); //will results in recursive call to this method.
> }
>