]> git.basschouten.com Git - openhab-addons.git/commitdiff
Fix #12926 (#12995)
authorKarel Goderis <karel.goderis@me.com>
Thu, 23 Jun 2022 16:52:31 +0000 (18:52 +0200)
committerGitHub <noreply@github.com>
Thu, 23 Jun 2022 16:52:31 +0000 (18:52 +0200)
Signed-Off-By: Karel Goderis <karel.goderis@me.com>
bundles/org.openhab.binding.knx/src/main/java/org/openhab/binding/knx/internal/dpt/KNXCoreTypeMapper.java

index 4c02a4bb4f0ce9880c6c4ad0b8a59d4dbc5cedce..7fd0a353de67810db140ff554eb7300579a2974f 100644 (file)
@@ -95,6 +95,7 @@ public class KNXCoreTypeMapper implements KNXTypeMapper {
     private final Logger logger = LoggerFactory.getLogger(KNXCoreTypeMapper.class);
 
     private static final String TIME_DAY_FORMAT = new String("EEE, HH:mm:ss");
+    private static final String TIME_FORMAT = new String("HH:mm:ss");
     private static final String DATE_FORMAT = new String("yyyy-MM-dd");
 
     /**
@@ -1085,7 +1086,11 @@ public class KNXCoreTypeMapper implements KNXTypeMapper {
                     stb.replace(start, end, String.format(Locale.US, "%1$ta", Calendar.getInstance()));
                     value = stb.toString();
                 }
-                date = new SimpleDateFormat(TIME_DAY_FORMAT, Locale.US).parse(value);
+                try {
+                    date = new SimpleDateFormat(TIME_DAY_FORMAT, Locale.US).parse(value);
+                } catch (ParseException pe) {
+                    date = new SimpleDateFormat(TIME_FORMAT, Locale.US).parse(value);
+                }
             }
         } catch (ParseException pe) {
             // do nothing but logging