Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
theodolite
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sören Henning
theodolite
Commits
6aeba702
Commit
6aeba702
authored
3 years ago
by
JustAnotherChristoph
Committed by
Christopher Konkel
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Now performing null check on fields appropriately
parent
53a214cb
No related branches found
No related tags found
1 merge request
!269
correct and test ResourceSets#loadResourceSet(..)
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
theodolite/src/main/kotlin/theodolite/benchmark/ResourceSets.kt
+9
-9
9 additions, 9 deletions
...lite/src/main/kotlin/theodolite/benchmark/ResourceSets.kt
with
9 additions
and
9 deletions
theodolite/src/main/kotlin/theodolite/benchmark/ResourceSets.kt
+
9
−
9
View file @
6aeba702
...
@@ -21,10 +21,10 @@ class ResourceSets: KubernetesResource {
...
@@ -21,10 +21,10 @@ class ResourceSets: KubernetesResource {
var
fileSystem
:
FileSystemResourceSet
?
=
null
var
fileSystem
:
FileSystemResourceSet
?
=
null
fun
loadResourceSet
(
client
:
NamespacedKubernetesClient
):
Collection
<
Pair
<
String
,
HasMetadata
>>
{
fun
loadResourceSet
(
client
:
NamespacedKubernetesClient
):
Collection
<
Pair
<
String
,
HasMetadata
>>
{
// TODO Find out whether field access (::configMap) is really what we want to do here (see #362)
return
if
(
::
configMap
!=
null
)
{
return
if
(
this
.
configMap
!=
null
)
{
configMap
?.
getResourceSet
(
client
=
client
)
!!
configMap
?.
getResourceSet
(
client
=
client
)
!!
}
else
if
(
::
fileSystem
!=
null
)
{
}
else
if
(
this
.
fileSystem
!=
null
)
{
fileSystem
?.
getResourceSet
(
client
=
client
)
!!
fileSystem
?.
getResourceSet
(
client
=
client
)
!!
}
else
{
}
else
{
throw
DeploymentFailedException
(
"Could not load resourceSet."
)
throw
DeploymentFailedException
(
"Could not load resourceSet."
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment