summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Budäus <karsten.budaeus@sbb.ch>2022-06-21 11:21:40 +0200
committerKarsten Budäus <karsten.budaeus@sbb.ch>2022-06-21 11:21:40 +0200
commit9a5332381d98ca66f36385f2cf4d4cdbe5c45f4d (patch)
treed45fc69e8e51c33951fc5ea03bd19eeb1ccd5891
parentMerge pull request #51 from UnionInternationalCheminsdeFer/feature/update-pom-to-build-project-locally (diff)
downloadUIC-barcode-9a5332381d98ca66f36385f2cf4d4cdbe5c45f4d.tar
UIC-barcode-9a5332381d98ca66f36385f2cf4d4cdbe5c45f4d.tar.gz
UIC-barcode-9a5332381d98ca66f36385f2cf4d4cdbe5c45f4d.tar.bz2
UIC-barcode-9a5332381d98ca66f36385f2cf4d4cdbe5c45f4d.tar.lz
UIC-barcode-9a5332381d98ca66f36385f2cf4d4cdbe5c45f4d.tar.xz
UIC-barcode-9a5332381d98ca66f36385f2cf4d4cdbe5c45f4d.tar.zst
UIC-barcode-9a5332381d98ca66f36385f2cf4d4cdbe5c45f4d.zip
-rw-r--r--src/main/java/org/uic/barcode/asn1/uper/AsnExtractor.java8
-rw-r--r--src/main/java/org/uic/barcode/asn1/uper/SeqOfCoder.java2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/uic/barcode/asn1/uper/AsnExtractor.java b/src/main/java/org/uic/barcode/asn1/uper/AsnExtractor.java
index 0d5d1da..c14af9e 100644
--- a/src/main/java/org/uic/barcode/asn1/uper/AsnExtractor.java
+++ b/src/main/java/org/uic/barcode/asn1/uper/AsnExtractor.java
@@ -42,10 +42,10 @@ public class AsnExtractor {
if (extractionStarted || extractionCompleted) return false;
- if (path != null && path.length() > 0 && className != null & className.length() > 0) {
- if (className.endsWith(path)){
- return true;
- }
+ if (path != null && path.length() > 0 &&
+ className != null && className.length() > 0 &&
+ className.endsWith(path)) {
+ return true;
}
return false;
diff --git a/src/main/java/org/uic/barcode/asn1/uper/SeqOfCoder.java b/src/main/java/org/uic/barcode/asn1/uper/SeqOfCoder.java
index d0ce782..290d1aa 100644
--- a/src/main/java/org/uic/barcode/asn1/uper/SeqOfCoder.java
+++ b/src/main/java/org/uic/barcode/asn1/uper/SeqOfCoder.java
@@ -29,7 +29,7 @@ class SeqOfCoder implements Decoder, Encoder {
//CG pass annotations too each field encoding
Annotation[] annotationArray = new Annotation[] {};
- if (annotations != null & annotations.getAnnotations() != null && !annotations.getAnnotations().isEmpty()) {
+ if (annotations != null && annotations.getAnnotations() != null && !annotations.getAnnotations().isEmpty()) {
ArrayList<Annotation> fieldAnnotations = new ArrayList<Annotation>();
fieldAnnotations.addAll(annotations.getAnnotations());
annotationArray = new Annotation[fieldAnnotations.size()];