← Back to branch summary

~hjd/ubuntu/wily/xmlgraphics-commons/debian-merged

« back to all changes in this revision

Viewing changes to src/java/org/apache/xmlgraphics/xmp/XMPArray.java

  • Committer: Hans Joachim Desserud
  • Date: 2015-11-11 18:22:53 UTC
  • mfrom: (9.1.5 sid)
  • Revision ID: hans_joachim_desserud-20151111182253-zwi0frfm97j0wddn
  * Merge from Debian unstable.  Remaining changes:
    - d/control: Drop dependencies required for unit testing as they
      include libmockito-java which would pull maven into main, disable unit
      test execution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/java/org/apache/xmlgraphics/xmp/XMPArray.java
15
15
 * limitations under the License.
16
16
 */
17
17
 
18
 
/* $Id: XMPArray.java 1311929 2012-04-10 19:00:48Z gadams $ */
 
18
/* $Id: XMPArray.java 1681698 2015-05-26 07:49:35Z ssteiner $ */
19
19
 
20
20
package org.apache.xmlgraphics.xmp;
21
21
 
114
114
                }
115
115
            }
116
116
        }
117
 
        if (lang != null & v == null && valueForParentLanguage != null) {
 
117
        if (lang != null && v == null && valueForParentLanguage != null) {
118
118
            //Use value found for parent language
119
119
            v = valueForParentLanguage;
120
120
        }