From commits-return-8131-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Nov 11 21:19:51 2017 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 055E410F40 for ; Sat, 11 Nov 2017 21:19:51 +0000 (UTC) Received: (qmail 64871 invoked by uid 500); 11 Nov 2017 21:19:51 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 64839 invoked by uid 500); 11 Nov 2017 21:19:50 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 64830 invoked by uid 99); 11 Nov 2017 21:19:50 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Nov 2017 21:19:50 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 7BF1D3A00E6 for ; Sat, 11 Nov 2017 21:19:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1814987 - /jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Date: Sat, 11 Nov 2017 21:19:47 -0000 To: commits@jmeter.apache.org From: pmouawad@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171111211949.7BF1D3A00E6@svn01-us-west.apache.org> Author: pmouawad Date: Sat Nov 11 21:19:47 2017 New Revision: 1814987 URL: http://svn.apache.org/viewvc?rev=1814987&view=rev Log: Allow folder to end with ".jar" Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1814987&r1=1814986&r2=1814987&view=diff ============================================================================== --- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original) +++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Sat Nov 11 21:19:47 2017 @@ -203,14 +203,14 @@ public final class ClassFinder { Set fullList = new HashSet<>(); for (final String path : paths) { fullList.add(path); // Keep the unexpanded path - // TODO - allow directories to end with .jar by removing this check? - if (!path.endsWith(DOT_JAR)) { - File dir = new File(path); - if (dir.exists() && dir.isDirectory()) { - String[] jars = dir.list((f, name) -> name.endsWith(DOT_JAR)); - if(jars != null) { - Collections.addAll(fullList, jars); - } + File dir = new File(path); + if (dir.exists() && dir.isDirectory()) { + String[] jars = dir.list((f, name) -> { + File fileInDirectory = new File(f, name); + return fileInDirectory.isFile() && name.endsWith(DOT_JAR); + }); + if(jars != null) { + Collections.addAll(fullList, jars); } } }