You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2025/12/15 08:07:01 UTC

(camel-k) 02/03: fix: revert to original check style per review feedback

This is an automated email from the ASF dual-hosted git repository.

pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit e72906e5913a733670ff2a09db74c8525ab63ffb
Author: Gregorius Bima Kharisma Wicaksana <51...@users.noreply.github.com>
AuthorDate: Sun Dec 14 16:50:02 2025 +0700

    fix: revert to original check style per review feedback
---
 pkg/trait/jvm.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go
index 6fa104123..a9939d25b 100644
--- a/pkg/trait/jvm.go
+++ b/pkg/trait/jvm.go
@@ -221,21 +221,19 @@ func getClasspathSet(cps string) *sets.Set {
 }
 
 func (t *jvmTrait) getIntegrationKit(e *Environment) (*v1.IntegrationKit, error) {
-	if e.IntegrationKit != nil {
-		return e.IntegrationKit, nil
-	}
+	kit := e.IntegrationKit
 
-	if e.Integration.Status.IntegrationKit != nil {
+	if kit == nil && e.Integration.Status.IntegrationKit != nil {
 		name := e.Integration.Status.IntegrationKit.Name
 		ns := e.Integration.GetIntegrationKitNamespace(e.Platform)
-		kit, err := kubernetes.GetIntegrationKit(e.Ctx, t.Client, name, ns)
+		k, err := kubernetes.GetIntegrationKit(e.Ctx, t.Client, name, ns)
 		if err != nil {
 			return nil, fmt.Errorf("unable to find integration kit %s/%s: %w", ns, name, err)
 		}
-		return kit, nil
+		kit = k
 	}
 
-	return nil, nil
+	return kit, nil
 }
 
 func (t *jvmTrait) enableDebug(e *Environment) string {