[PATCH] Bug in submission

[Peter M. Goldstein]

All,

Somehow the '!' operator got left out of the if clause in my earlier
submitted diffs.  For that patch to correct the attached diffs need to
be applied.  My apologies for the confusion.

--Peter

-----Original Message-----
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]] 
Sent: Sunday, July 28, 2002 4:28 AM
To: [EMAIL PROTECTED]
Subject: cvs commit:
jakarta-james/src/java/org/apache/james/nntpserver/repository
NNTPUtil.java

danny       2002/07/28 04:27:58

  Modified:    src/java/org/apache/james/mailrepository
                        JDBCMailRepository.java
               src/java/org/apache/james/userrepository
                        AbstractJdbcUsersRepository.java
               src/java/org/apache/james/nntpserver/repository
                        NNTPUtil.java
  Log:
  fix for bug #6812 thanks Peter Goldstein
  
  Revision  Changes    Path
  1.19      +4 -2
jakarta-james/src/java/org/apache/james/mailrepository/JDBCMailRepositor
y.java
  
  Index: JDBCMailRepository.java
  ===================================================================
  RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/mailrepository/JDBCMai
lRepository.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JDBCMailRepository.java   18 Apr 2002 14:49:15 -0000      1.18
  +++ JDBCMailRepository.java   28 Jul 2002 11:27:57 -0000      1.19
  @@ -202,8 +202,10 @@
           try {
               // Initialise the sql strings.
               String fileName =
sqlFileName.substring("file://".length());
  -            fileName = ((BlockContext)context).getBaseDirectory() +
  -                        File.separator + fileName;
  +            if (fileName.startsWith("/")) {
  +                fileName = ((BlockContext)context).getBaseDirectory()
+
  +                           File.separator + fileName;
  +            }
               File sqlFile = (new File(fileName)).getCanonicalFile();
   
               String resourceName =
"org.apache.james.mailrepository.JDBCMailRepository";
  
  
  
  1.5       +4 -2
jakarta-james/src/java/org/apache/james/userrepository/AbstractJdbcUsers
Repository.java
  
  Index: AbstractJdbcUsersRepository.java
  ===================================================================
  RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/userrepository/Abstrac
tJdbcUsersRepository.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractJdbcUsersRepository.java  18 Jan 2002 02:48:39 -0000
1.4
  +++ AbstractJdbcUsersRepository.java  28 Jul 2002 11:27:58 -0000
1.5
  @@ -191,8 +191,10 @@
   
               // Initialise the sql strings.
               String fileName =
m_sqlFileName.substring("file://".length());
  -            fileName = ((BlockContext)context).getBaseDirectory() +
  -                        File.separator + fileName;
  +            if (fileName.startsWith("/")) {
  +                fileName = ((BlockContext)context).getBaseDirectory()
+
  +                           File.separator + fileName;
  +            }
               File sqlFile = (new File(fileName)).getCanonicalFile();
               
               getLogger().debug("Reading SQL resources from file: " + 
  
  
  
  1.6       +8 -6
jakarta-james/src/java/org/apache/james/nntpserver/repository/NNTPUtil.j
ava
  
  Index: NNTPUtil.java
  ===================================================================
  RCS file:
/home/cvs/jakarta-james/src/java/org/apache/james/nntpserver/repository/
NNTPUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- NNTPUtil.java     18 Jan 2002 02:48:36 -0000      1.5
  +++ NNTPUtil.java     28 Jul 2002 11:27:58 -0000      1.6
  @@ -31,15 +31,17 @@
       static File getDirectory(Context context, Configuration
configuration, String child)
           throws ConfigurationException
       {
  -        String str = configuration.getChild(child).getValue();
  -        if (!str.toLowerCase().startsWith("file://") ) {
  +        String fileName = configuration.getChild(child).getValue();
  +        if (!fileName.toLowerCase().startsWith("file://") ) {
               throw new ConfigurationException
                   ("Malformed " + child + " - Must be of the format
\"file://<filename>\".");
           }
  -        str = str.substring("file://".length());
  -        str = ((BlockContext)context).getBaseDirectory() +
  -                File.separator + str;
  -        File f = new File(str);
  +        fileName = fileName.substring("file://".length());
  +        if (!(fileName.startsWith("/"))) {
  +            fileName = ((BlockContext)context).getBaseDirectory() +
  +                       File.separator + fileName;
  +        }
  +        File f = new File(fileName);
           if ( f.exists() && f.isFile() )
               throw new NNTPException("Expecting
'"+f.getAbsolutePath()+"' directory");
           if ( f.exists() == false )
  
  
  

--
To unsubscribe, e-mail:
<mailto:[EMAIL PROTECTED]>
For additional commands, e-mail:
<mailto:[EMAIL PROTECTED]>

JDBCMailRepository.java.diff
Description: Binary data

AbstractJdbcUsersRepository.java.diff
Description: Binary data

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>