← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat6/vivid-proposed

« back to all changes in this revision

Viewing changes to java/org/apache/catalina/realm/DataSourceRealm.java

  • Committer: Package Import Robot
  • Author(s): tony mancill
  • Date: 2013-08-03 21:50:20 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20130803215020-glb1brkoau0zxr5x
Tags: 6.0.37-1
* New upstream release.
  - Drop patches for CVE-2012-4534, CVE-2012-4431, CVE-2012-3546,
    CVE-2012-2733, CVE-2012-3439
  - Drop 0011-CVE-02012-0022-regression-fix.patch
  - Drop 0017-eclipse-compiler-update.patch
* Freshened remaining patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
java/org/apache/catalina/realm/DataSourceRealm.java
45
45
* @author Craig R. McClanahan
46
46
* @author Carson McDonald
47
47
* @author Ignacio Ortega
48
 
* @version $Revision: 892553 $
 
48
* @version $Revision: 1377917 $
49
49
*/
50
50
 
51
51
public class DataSourceRealm
542
542
     */
543
543
    protected ArrayList<String> getRoles(Connection dbConnection,
544
544
                                     String username) {
545
 
        
 
545
 
 
546
        if (allRolesMode != AllRolesMode.STRICT_MODE && !isRoleStoreDefined()) {
 
547
            // Using an authentication only configuration and no role store has
 
548
            // been defined so don't spend cycles looking
 
549
            return null;
 
550
        }
 
551
 
546
552
        ResultSet rs = null;
547
553
        PreparedStatement stmt = null;
548
554
        ArrayList<String> list = null;
622
628
 
623
629
    }
624
630
 
 
631
 
 
632
    private boolean isRoleStoreDefined() {
 
633
        return userRoleTable != null || roleNameCol != null;
 
634
    }
 
635
 
 
636
 
625
637
    // ------------------------------------------------------ Lifecycle Methods
626
638
 
627
 
 
628
639
    /**
629
640
     *
630
641
     * Prepare for active use of the public methods of this Component.