(camel-karavan) branch main updated: Fixes

[ma...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new eaec5195 Fixes
eaec5195 is described below

commit eaec519571fa0c2e92b85ef29a5125a963118aa2
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Thu Jan 18 17:37:37 2024 -0500

    Fixes
---
 .../src/main/java/org/apache/camel/karavan/api/DevModeResource.java   | 4 ++++
 .../src/main/java/org/apache/camel/karavan/git/GitService.java        | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
index 14bbc5a6..09fb6c49 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
@@ -31,12 +31,15 @@ import org.apache.camel.karavan.service.CamelService;
 import org.apache.camel.karavan.service.ConfigService;
 import org.apache.camel.karavan.service.ProjectService;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.logging.Logger;
 
 import static org.apache.camel.karavan.service.ContainerStatusService.CONTAINER_STATUS;
 
 @Path("/api/devmode")
 public class DevModeResource {
 
+    private static final Logger LOGGER = Logger.getLogger(DevModeResource.class.getName());
+
     @ConfigProperty(name = "karavan.environment")
     String environment;
 
@@ -71,6 +74,7 @@ public class DevModeResource {
                 return Response.notModified().build();
             }
         } catch (Exception e) {
+            LOGGER.error(e);
             return Response.serverError().entity(e).build();
         }
     }
diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
index c07496b0..30b195e7 100644
--- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
+++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
@@ -32,6 +32,7 @@ import org.apache.camel.karavan.kubernetes.KubernetesService;
 import org.apache.camel.karavan.service.ConfigService;
 import org.eclipse.jgit.api.*;
 import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.api.errors.InvalidRemoteException;
 import org.eclipse.jgit.api.errors.RefNotFoundException;
 import org.eclipse.jgit.api.errors.TransportException;
 import org.eclipse.jgit.diff.DiffEntry;
@@ -147,7 +148,7 @@ public class GitService {
         try {
             git = clone(folder, gitConfig.getUri(), gitConfig.getBranch(), cred);
             checkout(git, false, null, null, gitConfig.getBranch());
-        } catch (RefNotFoundException | TransportException e) {
+        } catch (RefNotFoundException | InvalidRemoteException e) {
             LOGGER.error("New repository");
             git = init(folder, gitConfig.getUri(), gitConfig.getBranch());
         } catch (Exception e) {