Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
2c604498
Commit
2c604498
authored
Mar 18, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be defensive with File.listFiles()
parent
433f9986
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
1 deletion
+52
-1
ExplodedArchive.java
.../springframework/boot/loader/archive/ExplodedArchive.java
+5
-1
SpecialArchiveTests.java
...ingframework/boot/loader/archive/SpecialArchiveTests.java
+47
-0
No files found.
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
View file @
2c604498
...
@@ -85,7 +85,11 @@ public class ExplodedArchive extends Archive {
...
@@ -85,7 +85,11 @@ public class ExplodedArchive extends Archive {
this
.
entries
.
put
(
entry
.
getName
(),
entry
);
this
.
entries
.
put
(
entry
.
getName
(),
entry
);
}
}
if
(
file
.
isDirectory
())
{
if
(
file
.
isDirectory
())
{
for
(
File
child
:
file
.
listFiles
())
{
File
[]
files
=
file
.
listFiles
();
if
(
files
==
null
)
{
return
;
}
for
(
File
child
:
files
)
{
if
(!
SKIPPED_NAMES
.
contains
(
child
.
getName
()))
{
if
(!
SKIPPED_NAMES
.
contains
(
child
.
getName
()))
{
if
(
file
.
equals
(
this
.
root
)
||
this
.
recursive
)
{
if
(
file
.
equals
(
this
.
root
)
||
this
.
recursive
)
{
buildEntries
(
child
);
buildEntries
(
child
);
...
...
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/SpecialArchiveTests.java
0 → 100644
View file @
2c604498
/*
* Copyright 2012-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org
.
springframework
.
boot
.
loader
.
archive
;
import
java.io.File
;
import
java.util.HashMap
;
import
java.util.Map
;
import
org.junit.Test
;
import
static
org
.
hamcrest
.
Matchers
.
greaterThan
;
import
static
org
.
junit
.
Assert
.
assertThat
;
/**
* @author Dave Syer
*/
public
class
SpecialArchiveTests
{
@Test
public
void
getEntriesForRoot
()
throws
Exception
{
ExplodedArchive
archive
=
new
ExplodedArchive
(
new
File
(
"/"
),
false
);
Map
<
String
,
Archive
.
Entry
>
entries
=
getEntriesMap
(
archive
);
assertThat
(
entries
.
size
(),
greaterThan
(
1
));
}
private
Map
<
String
,
Archive
.
Entry
>
getEntriesMap
(
Archive
archive
)
{
Map
<
String
,
Archive
.
Entry
>
entries
=
new
HashMap
<
String
,
Archive
.
Entry
>();
for
(
Archive
.
Entry
entry
:
archive
.
getEntries
())
{
entries
.
put
(
entry
.
getName
().
toString
(),
entry
);
}
return
entries
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment