[karaf] branch karaf-4.2.x updated: [KARAF-7093] Use .karaf/karaf.history file name instead of .karaf/karaf41.history

[jbonofre]

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

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new 60505a9  [KARAF-7093] Use .karaf/karaf.history file name instead of 
.karaf/karaf41.history
60505a9 is described below

commit 60505a966cc664d47f5fecf24189fa2f9e4a95ca
Author: jbonofre <jbono...@apache.org>
AuthorDate: Fri Apr 9 08:21:31 2021 +0200

    [KARAF-7093] Use .karaf/karaf.history file name instead of 
.karaf/karaf41.history
    
    (cherry picked from commit 190eec33a35f1af6140fe3a6ead454457d9a3330)
---
 .../java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
 
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
index 2561be1..b4af472 100644
--- 
a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
+++ 
b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/ConsoleSessionImpl.java
@@ -299,7 +299,7 @@ public class ConsoleSessionImpl implements Session {
      * @return the history file
      */
     protected Path getHistoryFile() {
-        String defaultHistoryPath = new File(System.getProperty("user.home"), 
".karaf/karaf41.history").toString();
+        String defaultHistoryPath = new File(System.getProperty("user.home"), 
".karaf/karaf.history").toString();
         return Paths.get(System.getProperty("karaf.history", 
defaultHistoryPath));
     }