Return-Path: <olegnitz@apache.org>
Mailing-List: contact ojb-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ojb-dev@jakarta.apache.org
Received: (qmail 12935 invoked by uid 97); 9 Jan 2003 23:54:53 -0000
Received: (qmail 12927 invoked by uid 98); 9 Jan 2003 23:54:53 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Received: (qmail 12892 invoked from network); 9 Jan 2003 23:54:50 -0000
Received: from daedalus.apache.org (HELO apache.org) (63.251.56.142)
  by nagoya.betaversion.org with SMTP; 9 Jan 2003 23:54:50 -0000
Received: (qmail 50193 invoked by uid 500); 9 Jan 2003 23:53:19 -0000
Received: (qmail 50178 invoked from network); 9 Jan 2003 23:53:19 -0000
Received: from icarus.apache.org (63.251.56.143)
  by daedalus.apache.org with SMTP; 9 Jan 2003 23:53:19 -0000
Received: (qmail 78439 invoked by uid 1520); 9 Jan 2003 23:53:11 -0000
Date: 9 Jan 2003 23:53:11 -0000
Message-ID: <20030109235311.78438.qmail@icarus.apache.org>
From: olegnitz@apache.org
To: jakarta-ojb-cvs@apache.org
Subject: cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker/metadata
 ConnectionDescriptorXmlHandler.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

olegnitz    2003/01/09 15:53:11

  Modified:    src/java/org/apache/ojb/broker/metadata
                        ConnectionDescriptorXmlHandler.java
  Log:
  Added check for duplicated default-connections
  
  Revision  Changes    Path
  1.3       +14 -1     jakarta-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionDescriptorXmlHandler.java
  
  Index: ConnectionDescriptorXmlHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/metadata/ConnectionDescriptorXmlHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ConnectionDescriptorXmlHandler.java	9 Jan 2003 16:58:36 -0000	1.2
  +++ ConnectionDescriptorXmlHandler.java	9 Jan 2003 23:53:11 -0000	1.3
  @@ -85,6 +85,7 @@
       private JdbcConnectionDescriptor m_CurrentJCD;
       private SequenceDescriptor currentSequenceDescriptor;
       private List conDesList;
  +    private boolean defaultConnectionFound = false;
   
       /**
        * All known xml tags are kept in this table.
  @@ -159,6 +160,18 @@
                           String defaultConnection = atts.getValue(tags.getTagById(DEFAULT_CONNECTION));
                           if (isDebug) logger.debug("     " + tags.getTagById(DEFAULT_CONNECTION) + ": " + defaultConnection);
                           m_CurrentJCD.setDefaultConnection(Boolean.valueOf(defaultConnection).booleanValue());
  +                        if (m_CurrentJCD.isDefaultConnection())
  +                        {
  +                            if (defaultConnectionFound)
  +                            {
  +                                throw new MetadataException("Found two jdbc-connection-descriptor elements with default-connection=\"true\"");
  +                            }
  +                            else
  +                            {
  +                                defaultConnectionFound = true;
  +                            }
  +                        }
  +
   
                           // set platform attribute
                           String platform = atts.getValue(tags.getTagById(DBMS_NAME));