Return-Path: Mailing-List: contact ojb-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list ojb-dev@jakarta.apache.org Received: (qmail 978 invoked by uid 97); 5 Jan 2003 09:27:40 -0000 Received: (qmail 974 invoked by uid 98); 5 Jan 2003 09:27:40 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Received: (qmail 942 invoked from network); 5 Jan 2003 09:27:38 -0000 Received: from daedalus.apache.org (HELO apache.org) (63.251.56.142) by nagoya.betaversion.org with SMTP; 5 Jan 2003 09:27:38 -0000 Received: (qmail 1542 invoked by uid 500); 5 Jan 2003 09:26:08 -0000 Received: (qmail 1535 invoked from network); 5 Jan 2003 09:26:08 -0000 Received: from icarus.apache.org (63.251.56.143) by daedalus.apache.org with SMTP; 5 Jan 2003 09:26:08 -0000 Received: (qmail 26337 invoked by uid 1513); 5 Jan 2003 09:26:07 -0000 Date: 5 Jan 2003 09:26:07 -0000 Message-ID: <20030105092607.26336.qmail@icarus.apache.org> From: brj@apache.org To: jakarta-ojb-cvs@apache.org Subject: cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker/util SqlHelper.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N brj 2003/01/05 01:26:07 Modified: src/java/org/apache/ojb/broker/util SqlHelper.java Log: consistent handling of null path Revision Changes Path 1.3 +3 -12 jakarta-ojb/src/java/org/apache/ojb/broker/util/SqlHelper.java Index: SqlHelper.java =================================================================== RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/util/SqlHelper.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SqlHelper.java 5 Jan 2003 09:16:22 -0000 1.2 +++ SqlHelper.java 5 Jan 2003 09:26:07 -0000 1.3 @@ -83,16 +83,7 @@ */ public static String cleanPath(String aPath) { - PathInfo p = splitPath(aPath); - - if (p != null) - { - return p.column; - } - else - { - return null; - } + return splitPath(aPath).column; } @@ -115,7 +106,7 @@ if (aPath == null) { - return null; + return new PathInfo(null, null); } braceBegin = aPath.indexOf("(");