Use identical formatted text for license
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dbcaa0e8 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dbcaa0e8 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dbcaa0e8 Branch: refs/heads/master Commit: dbcaa0e8f647d70ea970594dd43d61e6b65eff73 Parents: 2cd87b4 Author: Andy Seaborne <[email protected]> Authored: Sun Jul 19 10:40:19 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Tue Jul 21 21:33:40 2015 +0100 ---------------------------------------------------------------------- .../jena/sparql/core/DatasetChangesCapture.java | 3 ++- .../org/apache/jena/sparql/util/Context.java | 27 ++++++++++---------- .../apache/jena/sparql/core/TestContext.java | 27 ++++++++++---------- .../apache/jena/atlas/lib/PropertyUtils.java | 27 ++++++++++---------- 4 files changed, 44 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/dbcaa0e8/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java index 2e09941..0c72ffd 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DatasetChangesCapture.java @@ -108,7 +108,8 @@ public class DatasetChangesCapture implements DatasetChanges { @Override public void reset() { - actions.clear() ; + if ( actions != null ) + actions.clear() ; actions = null ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/dbcaa0e8/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java index 6593271..ce911a8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Context.java @@ -1,18 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jena.sparql.util ; http://git-wip-us.apache.org/repos/asf/jena/blob/dbcaa0e8/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java index 5dc0e46..c6a55a8 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestContext.java @@ -1,18 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jena.sparql.core ; http://git-wip-us.apache.org/repos/asf/jena/blob/dbcaa0e8/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java index f9acfc8..e69da44 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/PropertyUtils.java @@ -1,18 +1,19 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.jena.atlas.lib ;
